Merge pf migration

CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc

@@ -5,6 +5,9 @@
 #include <fstream>
 #include <TMath.h>
 
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
@@ -26,12 +29,13 @@
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h"
+#include "SiPixelLorentzAngle.h"
 int lower_bin_;
 
 using namespace std;
 using namespace edm;
 using namespace reco;
+using namespace analyzer;
 
 SiPixelLorentzAngle::SiPixelLorentzAngle(edm::ParameterSet const& conf) : 
   conf_(conf), filename_(conf.getParameter<std::string>("fileName")), filenameFit_(conf.getParameter<std::string>("fileNameFit")), ptmin_(conf.getParameter<double>("ptMin")), simData_(conf.getParameter<bool>("simData")),	normChi2Max_(conf.getParameter<double>("normChi2Max")), clustSizeYMin_(conf.getParameter<int>("clustSizeYMin")), residualMax_(conf.getParameter<double>("residualMax")), clustChargeMax_(conf.getParameter<double>("clustChargeMax")),hist_depth_(conf.getParameter<int>("binsDepth")), hist_drift_(conf.getParameter<int>("binsDrift"))
@@ -541,3 +545,5 @@ void SiPixelLorentzAngle::findMean(int i, int i_ring)
   _h_mean_[i_ring]->SetBinError(i, error);
 
 }
+
+DEFINE_FWK_MODULE(SiPixelLorentzAngle);

CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h → CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h

@@ -83,6 +83,8 @@
   };
 //}
 
+//SiPixelLorentzAngle is already the name of a data product
+namespace analyzer {
 class SiPixelLorentzAngle : public edm::EDAnalyzer
 {
  public:
@@ -198,6 +200,6 @@ class SiPixelLorentzAngle : public edm::EDAnalyzer
   edm::EDGetTokenT<TrajTrackAssociationCollection> t_trajTrack;
 
 };
-
+}
 
 #endif

CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.cc

@@ -2,8 +2,10 @@
 #include <string>
 #include <iostream>
 #include <fstream>
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
-#include "CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleDB.h"
+#include "SiPixelLorentzAngleDB.h"
 #include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
 #include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
@@ -175,3 +177,4 @@ void SiPixelLorentzAngleDB::endJob(){
 }
 
 
+DEFINE_FWK_MODULE(SiPixelLorentzAngleDB);

Calibration/HcalCalibAlgos/src/GammaJetAnalysis.cc

@@ -256,7 +256,7 @@ GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
 // Load EcalRecHits
 
     std::vector<edm::InputTag>::const_iterator i;
-    vector<CaloRecHit> theRecHits;
+    vector<std::pair<DetId, double> > theRecHits;
 
     try {
 
@@ -269,7 +269,7 @@ GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
 // EcalBarrel = 1, EcalEndcap = 2
 
 	 GlobalPoint pos = geo->getPosition(recHit->detid());
-         theRecHits.push_back(*recHit);
+         theRecHits.push_back(std::pair<DetId, double>(recHit->detid(), recHit->energy()));
 
 	 if( (*recHit).energy()> ecut[recHit->detid().subdetId()-1][0] )
                     (*myout_ecal)<<recHit->detid().subdetId()<<" "<<(*recHit).energy()<<" "<<pos.phi()<<" "<<pos.eta()
@@ -300,7 +300,7 @@ GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
         GlobalPoint pos = geo->getPosition(hbheItr->detid());
         (*myout_hcal)<<id.subdetId()<<" "<<(*hbheItr).energy()<<" "<<pos.phi()<<
                                       " "<<pos.eta()<<" "<<iEvent.id().event()<<endl;
-        theRecHits.push_back(*hbheItr);
+        theRecHits.push_back(std::pair<DetId, double>(hbheItr->detid(), hbheItr->energy()));
 
       }
     } catch (cms::Exception& e) { // can't find it!
@@ -336,9 +336,9 @@ GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
     if(vet>CutOnEgammaEnergy_) {
       ij++;
       float gammaiso_ecal[9] = {0.,0.,0.,0.,0.,0.,0.,0.,0.};
-     for(vector<CaloRecHit>::iterator it = theRecHits.begin(); it != theRecHits.end(); it++)
+     for(vector<std::pair<DetId, double> >::const_iterator it = theRecHits.begin(); it != theRecHits.end(); it++)
       {
-           GlobalPoint pos = geo->getPosition(it->detid());
+           GlobalPoint pos = geo->getPosition(it->first);
            double eta = pos.eta();
 	   double phi = pos.phi();
 	   double deta = fabs(eta-aClus->eta());
@@ -357,24 +357,24 @@ GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
 	     for (int j = 0; j<3; j++)
 	     {
 
-	        if(it->detid().det() == DetId::Ecal ) 
+	        if(it->first.det() == DetId::Ecal ) 
 		{
-		  if(it->detid().subdetId() == 1) ecutn = ecut[0][j];
-		  if(it->detid().subdetId() == 2) ecutn = ecut[1][j];
+		  if(it->first.subdetId() == 1) ecutn = ecut[0][j];
+		  if(it->first.subdetId() == 2) ecutn = ecut[1][j];
 		  if( dr>rmin && dr<risol[i])
 		  {
-		   if((*it).energy() > ecutn) gammaiso_ecal[itype_ecal] = gammaiso_ecal[itype_ecal]+(*it).energy()/cosh(eta);
+		   if((*it).second > ecutn) gammaiso_ecal[itype_ecal] = gammaiso_ecal[itype_ecal]+(*it).second/cosh(eta);
 		  } 
 		}
 
-		if(it->detid().det() == DetId::Hcal ) 
+		if(it->first.det() == DetId::Hcal ) 
 		{
 		   ecutn = ecut[2][j];
 		   if( dr>rmin && dr<risol[i])
 		   {
-		     if((*it).energy() > ecutn) 
+		     if((*it).first > ecutn) 
 		     {
-		        gammaiso_ecal[itype_ecal] = gammaiso_ecal[itype_ecal]+(*it).energy()/cosh(eta);
+		        gammaiso_ecal[itype_ecal] = gammaiso_ecal[itype_ecal]+(*it).second/cosh(eta);
 		     }
 		   }
 		} 

CondCore/CondDB/interface/IOVProxy.h

@@ -87,6 +87,8 @@ namespace cond {
 
       std::string payloadObjectType() const;
 
+      cond::SynchronizationType synchronizationType() const;
+
       cond::Time_t endOfValidity() const;
 
       cond::Time_t lastValidatedTime() const;

CondCore/CondDB/interface/KeyList.h

@@ -42,7 +42,7 @@ namespace cond {
 	if( !m_objects[n] ){
 	  auto i = m_data.find( n );
 	  if( i != m_data.end() ){
-	    m_objects[n] = deserialize<T>( i->second.first, i->second.second, m_isOra );
+	    m_objects[n] = deserialize<T>( i->second.first, i->second.second.first, i->second.second.second, m_isOra );
 	    m_data.erase( n );
 	  } else {
 	    throwException( "Payload for index "+boost::lexical_cast<std::string>(n)+" has not been found.",
@@ -57,8 +57,8 @@ namespace cond {
     private:
       // the db session
       IOVProxy m_proxy;
-      // the key selection
-      mutable std::map<size_t,std::pair<std::string,cond::Binary> > m_data;
+      // the key selection: 
+      mutable std::map<size_t,std::pair<std::string,std::pair<cond::Binary,cond::Binary> > > m_data;
       mutable std::vector<boost::shared_ptr<void> > m_objects;
       bool m_isOra = false;
 

CondCore/CondDB/interface/Serialization.h

@@ -22,7 +22,7 @@
 // temporarely
 #include <boost/shared_ptr.hpp>
 
-class TBufferFile;
+class RootStreamBuffer;
 
 namespace cond {
 
@@ -40,7 +40,7 @@ namespace cond {
   // output
   class RootOutputArchive {
   public:
-    explicit RootOutputArchive( std::ostream& destination );
+    RootOutputArchive( std::ostream& dataDest, std::ostream& streamerInfoDest );
 
     template <typename T>
     RootOutputArchive& operator<<( const T& instance );
@@ -49,7 +49,8 @@ namespace cond {
     void write( const std::type_info& sourceType, const void* sourceInstance);
   private:
     // here is where the write function will write on...
-    std::ostream& m_buffer;
+    std::ostream& m_dataBuffer;
+    std::ostream& m_streamerInfoBuffer;
   };
 
   template <typename T> inline RootOutputArchive& RootOutputArchive::operator<<( const T& instance ){
@@ -60,7 +61,7 @@ namespace cond {
   // input
   class RootInputArchive {
   public:
-    explicit RootInputArchive( std::istream& source );
+    RootInputArchive( std::istream& binaryData, std::istream& binaryStreamerInfo );
 
     virtual ~RootInputArchive();
 
@@ -71,8 +72,9 @@ namespace cond {
     void read( const std::type_info& destinationType, void* destinationInstance);
   private:
     // copy of the input stream. is referenced by the TBufferFile.
-    std::string m_buffer;
-    TBufferFile* m_streamer = nullptr;
+    std::string m_dataBuffer;
+    std::string m_streamerInfoBuffer;
+    RootStreamBuffer* m_streamer = nullptr;
   };
 
   template <typename T> inline RootInputArchive& RootInputArchive::operator>>( T& instance ){
@@ -85,35 +87,45 @@ namespace cond {
 
   // call for the serialization. Setting packingOnly = TRUE the data will stay in the original memory layout 
   // ( no serialization in this case ). This option is used by the ORA backend - will be dropped after the changeover
-  template <typename T> Binary serialize( const T& payload, bool packingOnly = false ){
-    Binary ret;
+  template <typename T> std::pair<Binary,Binary> serialize( const T& payload, bool packingOnly = false ){
+    std::pair<Binary,Binary> ret;
     if( !packingOnly ){
-      // save data to buffer
-      std::ostringstream buffer;
-      CondOutputArchive oa( buffer );
+      // save data to buffers
+      std::ostringstream dataBuffer;
+      std::ostringstream streamerInfoBuffer;
+      CondOutputArchive oa( dataBuffer, streamerInfoBuffer );
       oa << payload;
       //TODO: avoid (2!!) copies
-      ret.copy( buffer.str() );
+      ret.first.copy( dataBuffer.str() );
+      ret.second.copy( streamerInfoBuffer.str() );
     } else {
-      ret = Binary( payload );
+      // ORA objects case: nothing to serialize, the object is kept in memory in the original layout - the bare pointer is exchanged
+      ret.first = Binary( payload );
     }
     return ret;
   }
 
   // generates an instance of T from the binary serialized data. With unpackingOnly = true the memory is already storing the object in the final 
   // format. Only a cast is required in this case - Used by the ORA backed, will be dropped in the future.
-  template <typename T> boost::shared_ptr<T> deserialize( const std::string& payloadType, const Binary& payloadData, bool unpackingOnly = false){
+  template <typename T> boost::shared_ptr<T> deserialize( const std::string& payloadType, 
+							  const Binary& payloadData, 
+							  const Binary& streamerInfoData, 
+							  bool unpackingOnly = false){
     // for the moment we fail if types don't match... later we will check for base types...
     boost::shared_ptr<T> payload;
     if( !unpackingOnly ){
-      std::stringbuf sbuf;
-      sbuf.pubsetbuf( static_cast<char*>(const_cast<void*>(payloadData.data())), payloadData.size() );
-
-      std::istream buffer( &sbuf );
-      CondInputArchive ia(buffer);
+      std::stringbuf sdataBuf;
+      sdataBuf.pubsetbuf( static_cast<char*>(const_cast<void*>(payloadData.data())), payloadData.size() );
+      std::stringbuf sstreamerInfoBuf;
+      sstreamerInfoBuf.pubsetbuf( static_cast<char*>(const_cast<void*>(streamerInfoData.data())), streamerInfoData.size() );
+
+      std::istream dataBuffer( &sdataBuf );
+      std::istream streamerInfoBuffer( &sstreamerInfoBuf );
+      CondInputArchive ia( dataBuffer, streamerInfoBuffer );
       payload.reset( createPayload<T>(payloadType) );
       ia >> (*payload);
     } else {
+      // ORA objects case: nothing to de-serialize, the object is already in memory in the final layout, ready to be casted
       payload = boost::static_pointer_cast<T>(payloadData.oraObject().makeShared());
     }
     return payload;

CondCore/CondDB/interface/Session.h

@@ -88,7 +88,8 @@ namespace cond {
       // read access to the iov sequence. 
       // by default ( full=false ) the iovs are lazy-loaded in groups when required, with repeatable queries ( for FronTier )
       // full=true will load the entire sequence in memory. Mainly for test/debugging.
-      IOVProxy readIov( const std::string& tag, bool full=false );//,const boost::posix_time::ptime& snapshottime )  
+      IOVProxy readIov( const std::string& tag, 
+			bool full=false );//,const boost::posix_time::ptime& snapshottime )  
 
       // 
       bool existsIov( const std::string& tag );
@@ -97,13 +98,17 @@ namespace cond {
       // the type is required for consistency with the referenced payloads.    
       // fixme: add creation time - required for the migration
       template <typename T>
-      IOVEditor createIov( const std::string& tag, cond::TimeType timeType, 
+      IOVEditor createIov( const std::string& tag, 
+			   cond::TimeType timeType, 
 			   cond::SynchronizationType synchronizationType=cond::OFFLINE );
-      IOVEditor createIov(  const std::string& payloadType, const std::string& tag, cond::TimeType timeType,
+      IOVEditor createIov( const std::string& payloadType, 
+			   const std::string& tag, 
+			   cond::TimeType timeType,
 			   cond::SynchronizationType synchronizationType=cond::OFFLINE );
 
-      IOVEditor createIovForPayload(  const Hash& payloadHash, const std::string& tag, cond::TimeType timeType,
-				      cond::SynchronizationType synchronizationType=cond::OFFLINE );
+      IOVEditor createIovForPayload( const Hash& payloadHash, 
+				     const std::string& tag, cond::TimeType timeType,
+				     cond::SynchronizationType synchronizationType=cond::OFFLINE );
 
       // update an existing iov sequence with the specified tag.
       // timeType and payloadType can't be modified.
@@ -114,9 +119,13 @@ namespace cond {
 						     const boost::posix_time::ptime& creationTime = boost::posix_time::microsec_clock::universal_time() );
       template <typename T> boost::shared_ptr<T> fetchPayload( const cond::Hash& payloadHash );
 
-      // low-level function to access the payload data as a blob. mainly used for the data migration and testing. 
-      bool fetchPayloadData( const cond::Hash& payloadHash, std::string& payloadType, cond::Binary& payloadData );
-
+      // low-level function to access the payload data as a blob. mainly used for the data migration and testing.
+      // the version for ROOT 
+      bool fetchPayloadData( const cond::Hash& payloadHash, 
+			     std::string& payloadType, 
+			     cond::Binary& payloadData,
+			     cond::Binary& streamerInfoData );
+
       // internal functions. creates proxies without loading a specific tag.  
       IOVProxy iovProxy();
 
@@ -125,11 +134,17 @@ namespace cond {
 
       GTProxy readGlobalTag( const std::string& name );
       // essentially for the bridge. useless where ORA disappears.
-      GTProxy readGlobalTag( const std::string& name, const std::string& preFix, const std::string& postFix  );
+      GTProxy readGlobalTag( const std::string& name, 
+			     const std::string& preFix, 
+			     const std::string& postFix  );
     public:
 
-      bool checkMigrationLog( const std::string& sourceAccount, const std::string& sourceTag, std::string& destinationTag );
-      void addToMigrationLog( const std::string& sourceAccount, const std::string& sourceTag, const std::string& destinationTag );
+      bool checkMigrationLog( const std::string& sourceAccount, 
+			      const std::string& sourceTag, 
+			      std::string& destinationTag );
+      void addToMigrationLog( const std::string& sourceAccount, 
+			      const std::string& sourceTag, 
+			      const std::string& destinationTag );
 
       std::string connectionString();
 
@@ -140,7 +155,9 @@ namespace cond {
       bool isOraSession(); 
 
     private:
-      cond::Hash storePayloadData( const std::string& payloadObjectType, const cond::Binary& payloadData, const boost::posix_time::ptime& creationTime );
+      cond::Hash storePayloadData( const std::string& payloadObjectType, 
+				   const std::pair<Binary,Binary>& payloadAndStreamerInfoData, 
+				   const boost::posix_time::ptime& creationTime );
 
     private:
 
@@ -160,11 +177,12 @@ namespace cond {
 
     template <typename T> inline boost::shared_ptr<T> Session::fetchPayload( const cond::Hash& payloadHash ){
       cond::Binary payloadData;
+      cond::Binary streamerInfoData;
       std::string payloadType;
-      if(! fetchPayloadData( payloadHash, payloadType, payloadData ) ) 
+      if(! fetchPayloadData( payloadHash, payloadType, payloadData, streamerInfoData ) ) 
 	throwException( "Payload with id="+payloadHash+" has not been found in the database.",
 			"Session::fetchPayload" );
-      return deserialize<T>(  payloadType, payloadData, isOraSession() );
+      return deserialize<T>(  payloadType, payloadData, streamerInfoData, isOraSession() );
     }
 
     class TransactionScope {