Move CMSSW_7_4_X to be ROOT6 based.

cms-sw · Mar 31, 2015 · 2ffea3d · 2ffea3d
1 parent ea1bef3
commit 2ffea3d
Show file tree

Hide file tree

Showing 381 changed files with 4,854 additions and 4,891 deletions.
diff --git a/AnalysisDataFormats/SUSYBSMObjects/src/classes_def.xml b/AnalysisDataFormats/SUSYBSMObjects/src/classes_def.xml
@@ -22,7 +22,7 @@
    <class name="edm::Wrapper<susybsm::HSCPIsolation>"/>
    <class name="edm::Wrapper<susybsm::HSCPIsolationCollection>"/>
    <class name="edm::Wrapper<susybsm::HSCPIsolationValueMap>"/>
-   <class name="susybsm::HSCPCaloInfo" ClassVersion="11">
+   <class name="susybsm::HSCPCaloInfo" ClassVersion="12">
     <version ClassVersion="12" checksum="2407040083"/>
     <version ClassVersion="11" checksum="1170741674"/>
    </class>

diff --git a/AnalysisDataFormats/TrackInfo/src/classes_def.xml b/AnalysisDataFormats/TrackInfo/src/classes_def.xml
@@ -1,7 +1,7 @@
 <lcgdict>
   <class name="std::pair<LocalVector,LocalVector>"/>
   <class name="std::pair<LocalPoint,LocalPoint>"/>
-  <class name="reco::TrackingRecHitInfo" ClassVersion="10">
+  <class name="reco::TrackingRecHitInfo" ClassVersion="11">
    <version ClassVersion="11" checksum="803167075"/>
    <version ClassVersion="10" checksum="2470257581"/>
   </class>

diff --git a/CalibMuon/DTCalibration/plugins/DTT0CalibrationNew.cc b/CalibMuon/DTCalibration/plugins/DTT0CalibrationNew.cc
@@ -277,7 +277,7 @@ void DTT0CalibrationNew::analyze(const edm::Event & event, const edm::EventSetup
       //int npeaks = spectrum->Search((*lHisto).second,(tpPeakWidthPerLayer/2.),"goff",0.3);
       int npeaks = spectrum->Search((*lHisto).second,(tpPeakWidthPerLayer/2.),"",0.3);
 
-      float *peaks = spectrum->GetPositionX();	
+      double *peaks = spectrum->GetPositionX();
       //Put in a std::vector<float>
       vector<float> peakMeans(peaks,peaks + npeaks);
       //Sort the peaks in ascending order

diff --git a/CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.cc b/CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.cc
diff --git a/CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.h b/CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.h
diff --git a/CalibMuon/DTCalibration/plugins/SealModule.cc b/CalibMuon/DTCalibration/plugins/SealModule.cc
@@ -37,7 +37,6 @@
 #include "CalibMuon/DTCalibration/plugins/DTT0FillChamberFromDB.h"
 #include "CalibMuon/DTCalibration/plugins/DTT0WireInChamberReferenceCorrection.h"
 #include "CalibMuon/DTCalibration/plugins/DTT0AbsoluteReferenceCorrection.h"
-#include "CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.h"
 
 #include "CalibMuon/DTCalibration/interface/DTVDriftPluginFactory.h"
 #include "CalibMuon/DTCalibration/plugins/DTVDriftMeanTimer.h"
@@ -75,7 +74,6 @@ DEFINE_EDM_PLUGIN(DTT0CorrectionFactory,dtCalibration::DTT0FillDefaultFromDB,"DT
 DEFINE_EDM_PLUGIN(DTT0CorrectionFactory,dtCalibration::DTT0FillChamberFromDB,"DTT0FillChamberFromDB");
 DEFINE_EDM_PLUGIN(DTT0CorrectionFactory,dtCalibration::DTT0WireInChamberReferenceCorrection,"DTT0WireInChamberReferenceCorrection");
 DEFINE_EDM_PLUGIN(DTT0CorrectionFactory,dtCalibration::DTT0AbsoluteReferenceCorrection,"DTT0AbsoluteReferenceCorrection");
-DEFINE_EDM_PLUGIN(DTT0CorrectionFactory,dtCalibration::DTT0FEBPathCorrection, "DTT0FEBPathCorrection");
 
 DEFINE_EDM_PLUGIN(DTVDriftPluginFactory,dtCalibration::DTVDriftMeanTimer,"DTVDriftMeanTimer");
 DEFINE_EDM_PLUGIN(DTVDriftPluginFactory,dtCalibration::DTVDriftSegment,"DTVDriftSegment");
diff --git a/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py
diff --git a/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfi.py b/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfi.py
diff --git a/CalibTracker/SiStripQuality/README.md b/CalibTracker/SiStripQuality/README.md