test

.github/workflows/main.yml

@@ -2,25 +2,30 @@ name: C++ CI Testing
 
 on: pull_request
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
-build_and_test:
+  build_and_test:
     runs-on: ubuntu-latest
     container: rootproject/root:${{ matrix.version }}
     strategy:
       matrix:
         version: [6.28.12-ubuntu22.04]
 
     steps:
-      - name: system dependancies
+      - name: system dependencies
         run: |
-          apt update
-          apt -y install git scons python2
+          apt -y update
+          apt -y upgrade
+          apt -y install git python3-pip
+          python -m pip install scons meson ninja
 
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-          path: .
 
       - name: set env vars
         run: |
@@ -36,25 +41,18 @@ build_and_test:
           echo "PATH=$PWD/bin:$CCDB_HOME:$CCDB_HOME/bin:$RCDB_HOME/bin:$RCDB_HOME/cpp/bin:$PATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$RCDB_HOME/cpp/lib:$CCDB_HOME/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-
-      - name: checkout hipo
-        uses: actions/checkout@v4
-        with:
-          repository: gavalian/hipo
-          ref: 4.0.1 # if you want to use a fixed tag; remove if you want to use `main`
-          path: ${HIPO}
+      - name: Create hipo folder
+        run: |
+          mkdir -p $HIPO
 
       - name: build hipo
-        run: |
-          cd $HIPO
-          cmake -DCMAKE_INSTALL_PREFIX=$HIPO
-          cmake --build . --target install
+        run: ./installHIPO $HIPO
 
       - name: build ccdb
         run: |
           cd $CCDB_HOME
-          bash environment.bash
-          /usr/bin/env python2 $(which scons)
+          source environment.bash
+          python $(which scons)
 
       - name: build clas12root
         run: |

.gitignore

@@ -1,10 +1,13 @@
 # diff between stock checkout and after ./installC12Root
 bin
 build
-hipo4
 lib
 man
 
+# dependency installations
+##############
+/hipo
+
 # hipo source
 ##############
 ExtraPackages/rhipo/chipo/

.gitmodules

@@ -1,12 +1,15 @@
 [submodule "lz4"]
 	path = lz4
 	url = https://github.com/lz4/lz4.git
-[submodule "ccdb"]
-	path = ccdb
-	url = https://github.com/JeffersonLab/ccdb.git
 [submodule "rcdb"]
 	path = rcdb
 	url = https://github.com/JeffersonLab/rcdb
 [submodule "clas12-qadb"]
 	path = clas12-qadb
 	url = https://github.com/JeffersonLab/clas12-qadb
+[submodule "ccdb"]
+	path = ccdb
+	url = https://github.com/baltzell/ccdb.git
+[submodule "hipo_src"]
+	path = hipo_src
+	url = https://github.com/gavalian/hipo.git

CMakeLists.txt

@@ -31,7 +31,7 @@ if (DEFINED ENV{HIPO})
 
   set(HIPOEXT $ENV{HIPO})
   set(HIPO_INCLUDE_DIR ${HIPOEXT}/include/)
-  set(HIPO_LIBS -L${HIPOEXT}/ -lhipo4)
+  set(HIPO_LIBS "-L${HIPOEXT}/lib -lhipo4")
 
   MESSAGE( STATUS "HIPO INCLUDE_DIR : " ${HIPO_INCLUDE_DIR} )
   MESSAGE( STATUS "HIPO LIBRARIES : " ${HIPO_LIBS} )
@@ -52,10 +52,14 @@ ENDIF (DEFINED ENV{QADB})
 
 
 
+set(HIPOROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/hipo4)
 set(CLAS12ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Clas12Root)
 set(CLAS12BANKS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Clas12Banks)
 
 
+include_directories(${HIPOROOT_DIR})
+add_subdirectory (${HIPOROOT_DIR})
+
 include_directories(${CLAS12BANKS_DIR})
 add_subdirectory (${CLAS12BANKS_DIR})
 

Clas12Banks/clas12databases.cpp

@@ -41,10 +41,12 @@ namespace clas12 {
     _myRcdbPath=other._myRcdbPath;
     _myCcdbPath=other._myCcdbPath;
     //_myQadbPath=other._myQadbPath;
-
+     _pass = other._pass;
+
     initDBs();
 
-   if(_qadb.get()){
+   if(other._qadb.get()){
+     initQA();
      qadb_requireOkForAsymmetry(other._qadbReqOKAsymmetry);
      qadb_requireGolden(other._qadbReqGolden);
      qadb_setQARequirements(other._qadbReqsQA);
@@ -57,11 +59,12 @@ namespace clas12 {
     _myRcdbPath=other._myRcdbPath;
     _myCcdbPath=other._myCcdbPath;
     //_myQadbPath=other._myQadbPath;
-
+    _pass = other._pass;
 
     initDBs();
 
-    if(_qadb.get()){
+    if(other._qadb.get()){
+      initQA();
       qadb_requireOkForAsymmetry(other._qadbReqOKAsymmetry);
       qadb_requireGolden(other._qadbReqGolden);
       qadb_setQARequirements(other._qadbReqsQA);
@@ -86,10 +89,10 @@ namespace clas12 {
     }
 
 
-    _qadb.reset( new qadb_reader{0} );
-    qadb_requireOkForAsymmetry(_qadbReqOKAsymmetry);
-    qadb_requireGolden(_qadbReqGolden);
-    qadb_setQARequirements(_qadbReqsQA);  
+    // _qadb.reset( new qadb_reader{0} );
+    // qadb_requireOkForAsymmetry(_qadbReqOKAsymmetry);
+    // qadb_requireGolden(_qadbReqGolden);
+    // qadb_setQARequirements(_qadbReqsQA);  
 
 }
   //update run number to each database
@@ -105,8 +108,11 @@ namespace clas12 {
      if(_ccdb.get()!=nullptr){
       _ccdb->setRun(runNb);
       _ccdb->updateTables();
-    }
-    if(_qadb.get()!=nullptr)_qadb->setRun(runNb);
+     }
+     if(_qadb.get()!=nullptr){
+       //     _qadb->setRun(runNb);
+       initQA();
+     }
     if(_rcdb.get()!=nullptr)_rcdb->readRun(runNb);
 
     close();

Clas12Banks/clas12databases.h

@@ -64,7 +64,12 @@ namespace clas12 {
     //qadb stuff
     //I would rather this was not needed here
     //but it is to make sure it gets passed to PROOF
-    void qadb_addQARequirement(string req){ _qadb->addQARequirement(req);_qadbReqsQA.push_back(req);};
+    void qadb_addQARequirement(string req){
+      if(_qadb.get()==nullptr){
+	throw std::runtime_error("clas12databases::qadb_addQARequirement - Need to call clas12reader::applyQA(cook) first");
+      }
+      _qadb->addQARequirement(req);_qadbReqsQA.push_back(req);
+    }
     void qadb_setQARequirements( std::vector<string> reqs){_qadb->setQARequirements(reqs); _qadbReqsQA = reqs;};
 
     void qadb_requireOkForAsymmetry(bool ok){_qadb->requireOkForAsymmetry(ok);_qadbReqOKAsymmetry=ok;};
@@ -75,13 +80,26 @@ namespace clas12 {
     void turnOffQADB(){_qadb.reset();}
     void turnOffRCDB(){_rcdb.reset();}
     void turnOffCCDB(){_ccdb.reset();}
+
+    void setPass(const string& pass){
+      _pass = pass;
+      initQA();
+    }
+    void initQA(){
+      std::cout<<"clas12databases::initQA pass = "<<_pass<<" run ="<<_runNb<<std::endl;
+     _qadb.reset( new qadb_reader{_pass,_runNb} );
+      qadb_requireOkForAsymmetry(_qadbReqOKAsymmetry);
+      qadb_requireGolden(_qadbReqGolden);
+      qadb_setQARequirements(_qadbReqsQA);  
+    }
   private:
 
    //names for copying to ROOT file for selector
     string _myRcdbPath;
     string  _myCcdbPath;
     //string  _myQadbPath;
 
+    string _pass; //!
     int _runNb={0};//!
 
     std::unique_ptr<rcdb_reader> _rcdb;//!

Clas12Banks/clas12reader.h

@@ -146,14 +146,37 @@ namespace clas12 {
     int getBankOrder(int ibank,std::string itemname ) const{
       return getBank(ibank)->getSchema().getEntryOrder(itemname.data());
     }
+
+    const std::vector<hipo::bank*> getBanksPtrs(std::vector<std::string> names) const{
+      std::vector<hipo::bank*> blist;
+      for(const auto& name:names){
+	//Find this bank in all banks
+	auto it = std::find_if(
+			       _allBanks.begin(),
+			       _allBanks.end(),
+			       [&name](auto* bank)
+			       { return bank->getSchema().getName() == name; });
+	if(it == _allBanks.end()) {
+	  cerr<<"clas12reader::getBanks : bank "<<name<<" does not exist"<<endl;
+	  exit(0);
+	}
+	//make a copy and add to list
+	auto cpBank = dynamic_cast<hipo::bank*>(*it);
+	blist.push_back(cpBank);
+
+      }
+      cout<<"clas12reader::getBanks  got "<<blist.size()<<endl;
+      return blist;
+    }
+
     /////////////////////////////////
 
     std::vector<region_part_ptr>& getDetParticles(){return _detParticles;}
     std::vector<region_part_ptr>* getDetParticlesPtr(){return &_detParticles;}
     std::vector<region_part_ptr> getByID(int id);
     std::vector<region_part_ptr> getByRegion(int ir);
     std::vector<region_part_ptr> getByCharge(int ch);
-    
+
     const std::vector<short>& preCheckPids();
     const std::vector<short>& preCheckPidsOrCharge();
 
@@ -347,14 +370,9 @@ namespace clas12 {
     clas12databases* db(){return _db;};
 
     //clas12-qadb   
-    void applyQA() {
-      // if(_db)
-	if( _db->qa() )
-	  _applyQA=true;
-
-      if( _applyQA==false){
-	std::cout<<"Warning, clas12reader  applyQA() not valid"<<std::endl;
-      }
+    void applyQA(const string& pass) {
+      _applyQA=true;
+      _db->setPass(pass);
     }
 
     //double sumChargeFromQA();

Clas12Banks/covmatrix.h

@@ -40,8 +40,8 @@ namespace clas12 {
     int getPindex() { return getInt(_pindex_order,_index);}
     int getIndex() const {return _index;}
     int getIndex(int pindex);
-    void setIndex(int ind){_index=ind;}
-    void setEntry(int ind){_index=ind;}
+    void setIndex(int ind) const{_index=ind;}
+    void setEntry(int ind) const{_index=ind;}
     void setBankEntry(int ind){_index=ind;}
 
     const  CovMatrix* matrix();
@@ -79,7 +79,7 @@ namespace clas12 {
     CovMatrix _matrix={5,std::vector<float>(5,0)};
     IndMatrix _morder={5,std::vector<int>(5,-1)};
     int  _pindex_order=-1;
-    int _index=-1;
+    mutable int _index=-1;
     //std::map<int,int> _rmap;
     std::vector<int> _rvec;
   };

Clas12Banks/event.h

@@ -51,7 +51,7 @@ namespace clas12 {
     void notify() final{
       bank::notify();
     }
-   void setEntry(int ind){}
+   void setEntry(int ind) const{}
    void setBankEntry(int ind){}
 
   private :

Clas12Banks/ftbevent.h

@@ -32,7 +32,7 @@ namespace clas12 {
 
     long    getCategory() const  noexcept{ return getLong(_cat_order,0); }
     float  getStartTime() const  noexcept{ return getFloat(_st_order,0); }
-    void setEntry(int ind){}
+    void setEntry(int ind) const {}
     void setBankEntry(int ind){}
 
     /**

Clas12Banks/ftbparticle.h

@@ -33,7 +33,7 @@ namespace clas12 {
     int _py_order{-1};
     int _pz_order{-1};
 
-    short _entry{0};
+    mutable short _entry{0};
 
   public:
 
@@ -67,7 +67,7 @@ namespace clas12 {
     float  getPz()    const noexcept{ return getFloat(_pz_order,_entry);}
 
 
-    void setEntry(short i){
+    void setEntry(short i) const{
       if( i<getRows() )_entry=i;
       else _entry = -1;
     }

Clas12Banks/helflip.h

@@ -49,7 +49,7 @@ namespace clas12 {
     void notify() final{
       bank::notify();
     }
-   void setEntry(int ind){}
+   void setEntry(int ind) const{}
    void setBankEntry(int ind){}
 
   private :

Clas12Banks/helonline.h

@@ -42,7 +42,7 @@ namespace clas12 {
     void notify() final{
       bank::notify();
     }
-   void setEntry(int ind){}
+   void setEntry(int ind) const{}
    void setBankEntry(int ind){}
 
   private :

Clas12Banks/mcparticle.h

@@ -81,12 +81,12 @@ namespace clas12 {
       return atan2(y,x);
     }
 
-    void setEntry(short i){
+    void setEntry(short i) const{
       if( i<getRows() )_entry=i;
       else _entry = -1;
 
      }
-    void setMatchEntry(short ip,short imc){
+    void setMatchEntry(short ip,short imc) const{
       _entry=imc;
       _matched_pindex=ip;
       if(_match.get())_match->setEntry(_matched_pindex);
@@ -105,7 +105,7 @@ namespace clas12 {
       _matched_pindex=-1;
       bank::notify();
     }
-    int match_to(int pindex){//pindex is index of reconstructed particle
+    int match_to(int pindex) const{//pindex is index of reconstructed particle
       _matched_pindex=pindex;
       return _match.get()!=nullptr ?
 	_entry=_match->getMCindex(pindex) : _entry=-1 ;
@@ -136,8 +136,8 @@ namespace clas12 {
     int _parent_order{-1};
     int _daughter_order{-1};
 
-    short _entry={0};
-    short _matched_pindex;
+    mutable short _entry={0};
+    mutable short _matched_pindex;
     mcmatch_uptr _match;
   };