Merge branch 'lcg97' of cepcgit.ihep.ac.cn:cepc-prototype/CEPCSW into lcg97

FWCore/FWCore/PodioDataSvc.h

@@ -37,7 +37,7 @@ public:
   using DataSvc::registerObject;
   /// Overriding standard behaviour of evt service
   /// Register object with the data store.
-  virtual StatusCode registerObject(const std::string& fullPath, DataObject* pObject) final;
+  virtual StatusCode registerObject(std::string_view parentPath, std::string_view fullPath, DataObject* pObject) override final;
 
   StatusCode readCollection(const std::string& collectionName, int collectionID);
 

FWCore/src/PodioDataSvc.cpp

@@ -101,10 +101,10 @@ StatusCode PodioDataSvc::readCollection(const std::string& collName, int collect
   collection->setID(id);
   wrapper->setData(collection);
   m_readCollections.emplace_back(std::make_pair(collName, collection));
-  return DataSvc::registerObject(collName, wrapper);
+  return DataSvc::registerObject("/Event", "/" + collName, wrapper);
 }
 
-StatusCode PodioDataSvc::registerObject(const std::string& fullPath, DataObject* pObject) {
+StatusCode PodioDataSvc::registerObject(std::string_view parentPath, std::string_view fullPath, DataObject* pObject) {
   DataWrapperBase* wrapper = dynamic_cast<DataWrapperBase*>(pObject);
   if (wrapper != nullptr) {
     podio::CollectionBase* coll = wrapper->collectionBase();
@@ -116,5 +116,5 @@ StatusCode PodioDataSvc::registerObject(const std::string& fullPath, DataObject*
       m_collections.emplace_back(std::make_pair(shortPath, coll));
     }
   }
-  return DataSvc::registerObject(fullPath, pObject);
+  return DataSvc::registerObject(parentPath, fullPath, pObject);
 }

README.md

@@ -8,11 +8,12 @@ Please refer to https://github.com/HEP-FCC/FCCSW
 ## Quick start
 
 ```
-$ source /cvmfs/cepcsw.ihep.ac.cn/prototype/setup.sh
+$ source /cvmfs/cepcsw.ihep.ac.cn/prototype/releases/externals/97.0.0/setup.sh
 $ git clone git@cepcgit.ihep.ac.cn:cepc-prototype/CEPCSW.git
 $ cd CEPCSW
+$ git checkout lcg97
 $ mkdir build && cd build
-$ cmake ..
+$ cmake .. -DHOST_BINARY_TAG=${BINARY_TAG}
 $ make
 $ ./run gaudirun.py '$EXAMPLESROOT/options/helloalg.py'
 ```