Merge branch 'cellid' into 'master'

Fix to use single CellID in data model

See merge request !12

JugDigi/src/components/ExampleCaloDigi.cpp

@@ -111,7 +111,7 @@ namespace Jug {
       eic::RawCalorimeterHitCollection* rawHitCollection = new eic::RawCalorimeterHitCollection();
       for(const auto& ahit : *simhits) {
         //std::cout << ahit << "\n";
-        eic::RawCalorimeterHit rawhit((long long)ahit.cellID(),
+        eic::RawCalorimeterHit rawhit((long long)ahit.cellID(), 
                         (long long)ahit.energyDeposit() * 100, 0);
         rawhits->push_back(rawhit);
       }

JugReco/src/components/TrackerHitReconstruction.cpp

@@ -78,7 +78,7 @@ namespace Jug {
         //std::array<double,3> posarr; pos.GetCoordinates(posarr);
         //std::array<double,3> dimarr; dim.GetCoordinates(posarr);
         //eic::TrackerHit hit;
-        eic::TrackerHit hit((long long)ahit.cellID(), (long long)ahit.cellID(), (long long)ahit.time(),
+        eic::TrackerHit hit((long long)ahit.cellID(),  (long long)ahit.time(),
                             (float)ahit.charge() / 10000.0, (float)0.0, {{pos.x(), pos.y(),pos.z()}},{{dim[0],dim[1],0.0}});
         rec_hits->push_back(hit);
       }

JugReco/src/components/TrackerSourceLinker.cpp

@@ -101,8 +101,8 @@ namespace Jug::Reco {
         cov(Acts::eBoundLoc0, Acts::eBoundLoc0) = ahit.covMatrix(0)*Acts::UnitConstants::mm;//*ahit.covMatrix(0);
         cov(Acts::eBoundLoc1, Acts::eBoundLoc1) = ahit.covMatrix(1)*Acts::UnitConstants::mm;//*ahit.covMatrix(1);
 
-        debug() << "cell ID : " << ahit.cellID0() << endmsg;
-        auto vol_ctx = m_geoSvc->cellIDPositionConverter()->findContext(ahit.cellID0());
+        debug() << "cell ID : " << ahit.cellID() << endmsg;
+        auto vol_ctx = m_geoSvc->cellIDPositionConverter()->findContext(ahit.cellID());
         auto vol_id = vol_ctx->identifier;
         debug() << " vol_id : " <<  vol_id << endmsg;
         debug() << " hit : " <<  ahit << endmsg;