diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
index 2df1b67e914d83a6278f81a2c19dd27e34abae66..7024b858a1a6bd0a29b07e0465a0dfb83280c57a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
@@ -174,6 +174,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
   // mapping files for radiation damage simulation
   std::vector<std::string> mapsPath_list;
 
+
   int currentRunNumber = ctx.eventID().run_number();
   if (currentRunNumber<222222) {
     writeCdo -> setBarrelToTThreshold(m_BarrelToTThresholdRUN1);
@@ -465,7 +466,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
 
   for (unsigned int i=0; i<mapsPath_list.size(); i++) {
     ATH_MSG_INFO("Using maps located in: "<<mapsPath_list.at(i) << " for layer No." << i);
-    std::unique_ptr<TFile> mapsFile(new TFile((mapsPath_list.at(i)).c_str())); //this is the ramo potential.
+    TFile* mapsFile = new TFile((mapsPath_list.at(i)).c_str()); //this is the ramo potential.
 
     //Setup ramo weighting field map
     TH3F* ramoPotentialMap_hold = 0;
@@ -477,15 +478,10 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
     }
     ramoPotentialMap.push_back(ramoPotentialMap_hold);
 
-    std::unique_ptr<TH2F> lorentzMap_e_hold((TH2F*)mapsFile->Get("lorentz_map_e"));
-    std::unique_ptr<TH2F> lorentzMap_h_hold((TH2F*)mapsFile->Get("lorentz_map_h"));
-    std::unique_ptr<TH2F> distanceMap_h_hold((TH2F*)mapsFile->Get("edistance"));
-    std::unique_ptr<TH2F> distanceMap_e_hold((TH2F*)mapsFile->Get("hdistance"));
-
-    lorentzMap_e.push_back(lorentzMap_e_hold.get());
-    lorentzMap_h.push_back(lorentzMap_h_hold.get());
-    distanceMap_e.push_back(distanceMap_e_hold.get());
-    distanceMap_h.push_back(distanceMap_h_hold.get());
+    lorentzMap_e.push_back((TH2F*)mapsFile->Get("lorentz_map_e"));
+    lorentzMap_h.push_back((TH2F*)mapsFile->Get("lorentz_map_h"));
+    distanceMap_e.push_back((TH2F*)mapsFile->Get("edistance"));
+    distanceMap_h.push_back((TH2F*)mapsFile->Get("hdistance"));
   }
   writeCdo -> setLorentzMap_e(lorentzMap_e);
   writeCdo -> setLorentzMap_h(lorentzMap_h);
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
index 7ceaf1edc5ea099a35b1e7b68551b09ccb8d05f9..e3fd0bba45b25ade8889a769fa240a45fee052a6 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
@@ -145,8 +145,7 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
     int barrel_ec   = pixelId->barrel_ec(element->identify());
     int layerIndex  = pixelId->layer_disk(element->identify());
 
-//STSTST    double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
-    double LACorr = 1.0;
+    double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
 
     if (not p_design){
       ATH_MSG_FATAL("Dynamic cast to PixelModuleDesign* failed in PixelSiLorentzAngleCondAlg::execute");
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
index 0e410735e5094deac2e8ce71580906caf8fbcab9..da8ac64821e5fa0c48b38fa9e5db109c58c170a6 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
@@ -210,8 +210,6 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
   const EBC_EVCOLL evColl = EBC_MAINEVCOLL;
   const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
 
-  std::cout << "STSTST SensorSimPlanarTool OK1 " << std::endl;
-
   //**************************************//
   //*** Now diffuse charges to surface *** //
   //**************************************//
@@ -251,8 +249,6 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
     int numBins_weightingPotential_y = 0;
     int numBins_weightingPotential_z = 0;
 
-    std::cout << "STSTST SensorSimPlanarTool OK2 " << m_doRadDamage << " " << !(Module.isDBM()) << " " << Module.isBarrel() << std::endl;
-
     if (m_doRadDamage && !(Module.isDBM()) && Module.isBarrel()) {
       centreOfPixel_i = p_design.positionFromColumnRow(pixel_i.etaIndex(), pixel_i.phiIndex());
 
@@ -267,8 +263,6 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
       nnLoop_pixelPhiMax = std::min( 2,pixel_i.phiIndex() );
       nnLoop_pixelPhiMin = std::max( -2, pixel_i.phiIndex() + 1 - phiCells );
 
-      std::cout << "STSTST SensorSimPlanarTool OK3 " << std::endl;
-
       //Setup values to check for overflow when using maps
       if (m_doInterpolateEfield) {
         numBins_driftTime_e = m_distanceMap_e[layer]->GetNbinsY(); //Returns nBins = totalBins - underflow - overflow 
@@ -278,18 +272,14 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
         numBins_weightingPotential_z = m_ramoPotentialMap[layer]->GetNbinsZ();        
       }
       else { // use fluence value from conditions data
-        std::cout << "STSTST SensorSimPlanarTool OK4 " << layer << std::endl;
         numBins_driftTime_e = moduleData->getDistanceMap_e(layer)->GetNbinsY();
         numBins_driftTime_h = moduleData->getDistanceMap_h(layer)->GetNbinsY();   
         numBins_weightingPotential_x = moduleData->getRamoPotentialMap(layer)->GetNbinsX();
         numBins_weightingPotential_y = moduleData->getRamoPotentialMap(layer)->GetNbinsY();
         numBins_weightingPotential_z = moduleData->getRamoPotentialMap(layer)->GetNbinsZ();        
-        std::cout << "STSTST SensorSimPlanarTool OK5 " << std::endl;
       }
     }
 
-    std::cout << "STSTST SensorSimPlanarTool OK6 " << std::endl;
-
     // Distance between charge and readout side.  p_design->readoutSide() is
     // +1 if readout side is in +ve depth axis direction and visa-versa.
     double dist_electrode = 0.5 * sensorThickness - Module.design().readoutSide() * depth_i;
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 4edd78354a3860371ee6e746b47b5a58e4b8491c..fa7194dfd35bf013b8502adea860043314ec573e 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -11,7 +11,7 @@
       330470  1183738949         368         444           9           1
       330470  1183742489         152         127           2           1
       330470  1183743040         285         326           5           0
-      330470  1183746343         492         495          12           0
+      330470  1183746343         492         492          12           0
       330470  1183746710           6           0           0           0
       330470  1183751782         239         246           2           0
       330470  1183752624         347         366           7           2
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 11c66571dfa97c2a8bae106e755da735b8cdd587..dfa272a87c613634073e9363afd47e5998135ffb 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -71,7 +71,7 @@ HLT_2g10_loose_mu20_L1MU20:
   stepFeatures:
     0: 3
     1: 3
-    2: 4
+    2: 5
 HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I:
   eventCount: 0
 HLT_2g20_tight_L12EM15VH:
@@ -585,7 +585,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
   stepFeatures:
     0: 4
     1: 5
-    2: 4
+    2: 6
     3: 4
     4: 4
     5: 4
@@ -603,7 +603,7 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 5
+    2: 7
     3: 5
     4: 5
 HLT_e17_lhvloose_nod0_L1EM15VHI:
@@ -617,7 +617,7 @@ HLT_e17_lhvloose_nod0_L1EM15VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
@@ -649,7 +649,7 @@ HLT_e24_lhvloose_L1EM20VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 5
+    2: 7
     3: 5
     4: 5
 HLT_e26_etcut_L1EM22VHI:
@@ -675,7 +675,7 @@ HLT_e26_lhloose_L1EM15VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 5
+    2: 7
     3: 5
     4: 5
 HLT_e26_lhloose_L1EM22VHI:
@@ -689,7 +689,7 @@ HLT_e26_lhloose_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhmedium_L1EM15VH:
@@ -703,7 +703,7 @@ HLT_e26_lhmedium_L1EM15VH:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhmedium_L1EM22VHI:
@@ -717,7 +717,7 @@ HLT_e26_lhmedium_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
@@ -733,7 +733,7 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
   stepFeatures:
     0: 10
     1: 10
-    2: 8
+    2: 10
     3: 8
     4: 8
     5: 4
@@ -749,7 +749,7 @@ HLT_e26_lhtight_L1EM15VH:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhtight_L1EM22VHI:
@@ -763,7 +763,7 @@ HLT_e26_lhtight_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhtight_gsf_L1EM22VHI:
@@ -777,7 +777,7 @@ HLT_e26_lhtight_gsf_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhtight_ivarloose_L1EM22VHI:
@@ -791,7 +791,7 @@ HLT_e26_lhtight_ivarloose_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 3
 HLT_e26_lhtight_ivarmedium_L1EM22VHI:
@@ -805,7 +805,7 @@ HLT_e26_lhtight_ivarmedium_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 3
 HLT_e26_lhtight_ivartight_L1EM22VHI:
@@ -819,7 +819,7 @@ HLT_e26_lhtight_ivartight_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 3
 HLT_e26_lhtight_nod0_L1EM22VHI:
@@ -833,7 +833,7 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e26_lhtight_nod0_L1EM24VHI:
@@ -847,7 +847,7 @@ HLT_e26_lhtight_nod0_L1EM24VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 4
+    2: 6
     3: 4
     4: 4
 HLT_e300_etcut_L1EM22VHI:
@@ -896,9 +896,9 @@ HLT_e5_lhloose_L1EM3:
     4: 6
   stepFeatures:
     0: 60
-    1: 145
-    2: 81
-    3: 46
+    1: 146
+    2: 78
+    3: 44
     4: 7
 HLT_e5_lhloose_noringer_L1EM3:
   eventCount: 6
@@ -910,8 +910,8 @@ HLT_e5_lhloose_noringer_L1EM3:
     4: 6
   stepFeatures:
     0: 56
-    1: 128
-    2: 84
+    1: 130
+    2: 88
     3: 46
     4: 7
 HLT_e5_lhmedium_L1EM3:
@@ -926,7 +926,7 @@ HLT_e5_lhmedium_L1EM3:
     0: 58
     1: 132
     2: 76
-    3: 44
+    3: 42
     4: 5
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 4
@@ -954,7 +954,7 @@ HLT_e5_lhtight_L1EM3:
     0: 57
     1: 129
     2: 74
-    3: 43
+    3: 41
     4: 5
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 4
@@ -968,7 +968,7 @@ HLT_e5_lhtight_nod0_L1EM3:
     0: 57
     1: 129
     2: 74
-    3: 43
+    3: 41
     4: 5
 HLT_e5_lhtight_noringer_L1EM3:
   eventCount: 4
@@ -980,8 +980,8 @@ HLT_e5_lhtight_noringer_L1EM3:
     4: 4
   stepFeatures:
     0: 45
-    1: 92
-    2: 61
+    1: 94
+    2: 60
     3: 36
     4: 5
 HLT_e5_lhtight_noringer_nod0_L1EM3:
@@ -994,8 +994,8 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
     4: 4
   stepFeatures:
     0: 45
-    1: 92
-    2: 61
+    1: 94
+    2: 60
     3: 36
     4: 5
 HLT_e60_lhmedium_L1EM22VHI:
@@ -1009,7 +1009,7 @@ HLT_e60_lhmedium_L1EM22VHI:
   stepFeatures:
     0: 2
     1: 2
-    2: 2
+    2: 4
     3: 2
     4: 2
 HLT_e60_lhmedium_nod0_L1EM22VHI:
@@ -1023,7 +1023,7 @@ HLT_e60_lhmedium_nod0_L1EM22VHI:
   stepFeatures:
     0: 2
     1: 2
-    2: 2
+    2: 4
     3: 2
     4: 2
 HLT_e7_etcut_L1EM3:
@@ -1053,7 +1053,7 @@ HLT_e7_lhmedium_mu24_L1MU20:
   stepFeatures:
     0: 18
     1: 17
-    2: 15
+    2: 17
     3: 14
     4: 4
     5: 4
@@ -1085,7 +1085,7 @@ HLT_g12_loose_LArPEB_L1EM10VH:
   stepFeatures:
     0: 11
     1: 11
-    2: 22
+    2: 24
     3: 6
     4: 6
 HLT_g140_etcut_L1EM22VHI:
@@ -1104,7 +1104,7 @@ HLT_g20_loose_L1EM15VH:
   stepFeatures:
     0: 9
     1: 9
-    2: 15
+    2: 17
     3: 6
 HLT_g20_loose_L1EM15VHI:
   eventCount: 5
@@ -1116,7 +1116,7 @@ HLT_g20_loose_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
     3: 5
 HLT_g20_loose_LArPEB_L1EM15:
   eventCount: 6
@@ -1129,7 +1129,7 @@ HLT_g20_loose_LArPEB_L1EM15:
   stepFeatures:
     0: 9
     1: 9
-    2: 15
+    2: 17
     3: 6
     4: 6
 HLT_g20_medium_L1EM15VH:
@@ -1142,7 +1142,7 @@ HLT_g20_medium_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 15
     3: 6
 HLT_g20_medium_L1EM15VHI:
   eventCount: 5
@@ -1154,7 +1154,7 @@ HLT_g20_medium_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
     3: 5
 HLT_g20_tight_L1EM15VH:
   eventCount: 5
@@ -1166,7 +1166,7 @@ HLT_g20_tight_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 15
     3: 5
 HLT_g20_tight_L1EM15VHI:
   eventCount: 5
@@ -1178,7 +1178,7 @@ HLT_g20_tight_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VH:
   eventCount: 5
@@ -1190,7 +1190,7 @@ HLT_g20_tight_icaloloose_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 15
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VHI:
   eventCount: 5
@@ -1202,7 +1202,7 @@ HLT_g20_tight_icaloloose_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VH:
   eventCount: 5
@@ -1214,7 +1214,7 @@ HLT_g20_tight_icalomedium_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 15
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VHI:
   eventCount: 5
@@ -1226,7 +1226,7 @@ HLT_g20_tight_icalomedium_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
     3: 5
 HLT_g20_tight_icalotight_L1EM15VH:
   eventCount: 0
@@ -1237,7 +1237,7 @@ HLT_g20_tight_icalotight_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 15
 HLT_g20_tight_icalotight_L1EM15VHI:
   eventCount: 0
   stepCounts:
@@ -1247,7 +1247,7 @@ HLT_g20_tight_icalotight_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 11
 HLT_g22_tight_L1EM15VH:
   eventCount: 5
   stepCounts:
@@ -1258,7 +1258,7 @@ HLT_g22_tight_L1EM15VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 12
     3: 5
 HLT_g25_etcut_L1EM20VH:
   eventCount: 7
@@ -1280,7 +1280,7 @@ HLT_g25_loose_L1EM20VH:
   stepFeatures:
     0: 9
     1: 9
-    2: 15
+    2: 17
     3: 7
 HLT_g25_medium_L1EM20VH:
   eventCount: 6
@@ -1292,7 +1292,7 @@ HLT_g25_medium_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 12
     3: 6
 HLT_g25_medium_mu24_ivarmedium_L1MU20:
   eventCount: 0
@@ -1308,7 +1308,7 @@ HLT_g25_medium_mu24_ivarmedium_L1MU20:
   stepFeatures:
     0: 4
     1: 4
-    2: 4
+    2: 6
     3: 4
     4: 4
     5: 2
@@ -1324,7 +1324,7 @@ HLT_g25_tight_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 12
     3: 5
 HLT_g300_etcut_L1EM22VHI:
   eventCount: 0
@@ -1342,7 +1342,7 @@ HLT_g35_loose_mu18_L1EM24VHI:
   stepFeatures:
     0: 4
     1: 4
-    2: 4
+    2: 6
     3: 4
     4: 4
     5: 2
@@ -1359,7 +1359,7 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
   stepFeatures:
     0: 10
     1: 10
-    2: 11
+    2: 13
 HLT_g3_loose_LArPEB_L1EM3:
   eventCount: 9
   stepCounts:
@@ -1385,7 +1385,7 @@ HLT_g40_loose_LArPEB_L1EM20VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 8
+    2: 10
     3: 5
     4: 5
 HLT_g5_etcut_L1EM3:
@@ -1408,7 +1408,7 @@ HLT_g5_loose_L1EM3:
   stepFeatures:
     0: 56
     1: 56
-    2: 101
+    2: 103
     3: 14
 HLT_g5_medium_L1EM3:
   eventCount: 9
@@ -1420,7 +1420,7 @@ HLT_g5_medium_L1EM3:
   stepFeatures:
     0: 48
     1: 48
-    2: 83
+    2: 81
     3: 12
 HLT_g5_tight_L1EM3:
   eventCount: 8
@@ -1432,7 +1432,7 @@ HLT_g5_tight_L1EM3:
   stepFeatures:
     0: 45
     1: 45
-    2: 76
+    2: 73
     3: 8
 HLT_g60_loose_LArPEB_L1EM20VHI:
   eventCount: 3
@@ -1445,7 +1445,7 @@ HLT_g60_loose_LArPEB_L1EM20VHI:
   stepFeatures:
     0: 3
     1: 3
-    2: 5
+    2: 7
     3: 3
     4: 3
 HLT_g80_loose_LArPEB_L1EM20VHI:
@@ -1570,15 +1570,15 @@ HLT_j420_subresjesgscIS_ftf_L1J100:
     0: 3
 HLT_j45_L1J15:
   eventCount: 0
-HLT_j45_csskpf_nojcalib_ftf_L1J15:
+HLT_j45_csskpf_nojcalib_ftf_L1J20:
   eventCount: 17
   stepCounts:
-    0: 20
+    0: 19
     1: 17
   stepFeatures:
-    0: 20
+    0: 19
     1: 37
-HLT_j45_cssktc_nojcalib_L1J15:
+HLT_j45_cssktc_nojcalib_L1J20:
   eventCount: 15
   stepCounts:
     0: 15
@@ -1592,75 +1592,75 @@ HLT_j45_ftf_L1J15:
   stepFeatures:
     0: 20
     1: 55
-HLT_j45_ftf_preselj20_L1J15:
+HLT_j45_ftf_preselj20_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 55
-HLT_j45_nojcalib_L1J15:
+HLT_j45_nojcalib_L1J20:
   eventCount: 17
   stepCounts:
     0: 17
   stepFeatures:
     0: 39
-HLT_j45_pf_ftf_010jvt_L1J15:
+HLT_j45_pf_ftf_010jvt_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 55
-HLT_j45_pf_ftf_020jvt_L1J15:
+HLT_j45_pf_ftf_020jvt_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 54
-HLT_j45_pf_ftf_050jvt_L1J15:
+HLT_j45_pf_ftf_050jvt_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 54
-HLT_j45_pf_ftf_L1J15:
+HLT_j45_pf_ftf_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 56
-HLT_j45_pf_ftf_preselj20_L1J15:
+HLT_j45_pf_ftf_preselj20_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 56
-HLT_j45_pf_nojcalib_ftf_L1J15:
+HLT_j45_pf_nojcalib_ftf_L1J20:
   eventCount: 18
   stepCounts:
-    0: 20
+    0: 19
     1: 18
   stepFeatures:
-    0: 20
+    0: 19
     1: 49
-HLT_j45_pf_subjesgscIS_ftf_L1J15:
+HLT_j45_pf_subjesgscIS_ftf_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 52
 HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
   eventCount: 14
@@ -1682,19 +1682,19 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
     0: 19
     1: 49
     2: 49
-HLT_j45_sktc_nojcalib_L1J15:
+HLT_j45_sktc_nojcalib_L1J20:
   eventCount: 15
   stepCounts:
     0: 15
   stepFeatures:
     0: 26
-HLT_j45_subjesIS_ftf_preselj20_L1J15:
+HLT_j45_subjesIS_ftf_preselj20_L1J20:
   eventCount: 19
   stepCounts:
-    0: 20
+    0: 19
     1: 19
   stepFeatures:
-    0: 20
+    0: 19
     1: 50
 HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
   eventCount: 18
@@ -1739,15 +1739,15 @@ HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
     1: 47
     2: 23
 HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
-  eventCount: 14
+  eventCount: 15
   stepCounts:
     0: 19
     1: 19
-    2: 14
+    2: 15
   stepFeatures:
     0: 19
     1: 47
-    2: 26
+    2: 28
 HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
   eventCount: 19
   stepCounts:
@@ -2222,7 +2222,7 @@ HLT_mu6_L1MU6:
     1: 12
     2: 13
     3: 13
-HLT_mu6_LRT_idperf_l2lrt_L1MU6:
+HLT_mu6_idperfLRT_l2lrt_L1MU6:
   eventCount: 10
   stepCounts:
     0: 10
@@ -2935,13 +2935,13 @@ HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
     0: 10
     1: 5
 HLT_xe100_pfopufit_L1XE50:
-  eventCount: 5
+  eventCount: 4
   stepCounts:
     0: 10
-    1: 5
+    1: 4
   stepFeatures:
     0: 10
-    1: 5
+    1: 4
 HLT_xe100_pfsum_L1XE50:
   eventCount: 6
   stepCounts: