Merge branch 'master' into fixDumperSC

Author: AuroraPerego

Alignment/CocoaModel/src/DeviationsFromFileSensor2D.cc

@@ -8,6 +8,7 @@
 #include "Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h"
 #include "Alignment/CocoaUtilities/interface/ALIFileIn.h"
 #include "Alignment/CocoaUtilities/interface/ALIUtils.h"
+#include <cassert>
 #include <cstdlib>
 #include <cmath>  // include floating-point std::abs functions
 #include <memory>
@@ -188,6 +189,7 @@ std::pair<ALIdouble, ALIdouble> DeviationsFromFileSensor2D::getDevis(ALIdouble i
     }
     ii++;
   }
+  assert(ii == theNPoints);
   if (insideMatrix == 0) {
     std::cerr << "!!EXITING intersection in Y outside matrix of deviations from file " << intersY << std::endl;
     exit(1);

Alignment/CocoaModel/src/Measurement.cc

@@ -627,8 +627,8 @@ void Measurement::copyMeas(Measurement* meas, const std::string& subsstr1, const
   theValueSimulated = new ALIdouble[theDim];
   theValueSimulated_orig = new ALIdouble[theDim];
   theValueIsSimulated = new ALIbool[theDim];
-  theValue = const_cast<ALIdouble*>(meas->value());
-  theSigma = const_cast<ALIdouble*>(meas->sigma());
+  [[clang::suppress]] theValue = const_cast<ALIdouble*>(meas->value());
+  [[clang::suppress]] theSigma = const_cast<ALIdouble*>(meas->sigma());
 
   unsigned int ii;
   for (ii = 0; ii < theDim; ii++) {

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLT_cff.py

@@ -13,10 +13,8 @@
 
 # Ingredient: onlineBeamSpot
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
-onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
-
-import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
-BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone(
+onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone(
+    useBSOnlineRecords = True,
     timeThreshold = 999999 # for express allow >48h old payloads for replays. DO NOT CHANGE
 )
 

Alignment/CommonAlignmentProducer/python/LSNumberFilter_cfi.py

@@ -6,5 +6,6 @@
     veto_HLT_Menu = [
         "LumiScan",
         "PPS",
-        "ECALTiming"]
+        "ECALTiming",
+        "ECAL"]
     )

Alignment/OfflineValidation/bin/haddws.C

@@ -170,7 +170,7 @@ void haddws() {
 
 void MergeRootfile(TDirectory *target, const vector<pair<TFile *, double> > &vFileList) {
   //cout << "Target path: " << target->GetPath() << endl;
-  TString path((char *)strstr(target->GetPath(), ":"));
+  TString path(strstr(target->GetPath(), ":"));
   path.Remove(0, 2);
 
   vec_pair_it it = vFileList.begin();