Added comments

Mu2e · Jul 29, 2024 · f9d98e0 · f9d98e0
1 parent 9d28e09
commit f9d98e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/RecoDataProducts/inc/ComboHit.hh b/RecoDataProducts/inc/ComboHit.hh
@@ -148,6 +148,7 @@ namespace mu2e {
       // This function is called recursively, so the the vector must be empty on the top-most call
 #ifndef __ROOTCLING__
       // find the parent at a given level
+      // if parent and grandparent are the same level, will select the grandparent unless stopatfirst set
       CHCPTR parent(StrawIdMask::Level level, bool stopatfirst=false) const;
       void fillStrawDigiIndices( size_t chindex, SHIV& shids, bool stopatfirst=false) const;
       // Fill indices to the specified level.  Return value is the collection to whic
@@ -174,6 +175,9 @@ namespace mu2e {
       void setAsSubset(CHCPTR const& other);
       void setAsSubset(art::Handle<ComboHitCollection> const& ohandle);
       void setAsSubset(art::ValidHandle<ComboHitCollection> const& ohandle);
+      // optionally specify what level to make as parent
+      // if parent and grandparent are the same level, will select the grandparent unless stopatfirst set
+      void setAsSubset(CHCPTR const& optr, StrawIdMask::Level level, bool stopatfirst=false);
       void setAsSubset(art::Handle<ComboHitCollection> const& ohandle, StrawIdMask::Level level, bool stopatfirst=false);
       void setAsSubset(art::ValidHandle<ComboHitCollection> const& ohandle, StrawIdMask::Level level, bool stopatfirst=false);
 #endif

diff --git a/RecoDataProducts/src/ComboHit.cc b/RecoDataProducts/src/ComboHit.cc
@@ -65,20 +65,14 @@ namespace mu2e {
   void ComboHitCollection::setAsSubset(art::Handle<ComboHitCollection> const& ohandle){
     if (ohandle.isValid()){
       auto optr = CHCPTR(ohandle);
-      _parent = optr->parent();
-      if (_parent.refCore().isNull()){
-        _parent = optr;
-      }
+      setAsSubset(optr);
     } else {
       throw cet::exception("RECO")<<"mu2e::ComboHitCollection: invalid handle" << std::endl;
     }
   }
   void ComboHitCollection::setAsSubset(art::ValidHandle<ComboHitCollection> const& ohandle){
     auto optr = CHCPTR(ohandle);
-    _parent = optr->parent();
-    if (_parent.refCore().isNull()){
-      _parent = optr;
-    }
+    setAsSubset(optr);
   }
   void ComboHitCollection::setAsSubset(CHCPTR const& other){
     _parent = other->parent();
@@ -90,19 +84,16 @@ namespace mu2e {
   void ComboHitCollection::setAsSubset(art::ValidHandle<ComboHitCollection> const& ohandle, StrawIdMask::Level level, bool stopatfirst){
     if (ohandle.isValid()){
       auto optr = CHCPTR(ohandle);
-      if (optr->level() == level && (stopatfirst || optr->parent().refCore().isNull() || optr->parent()->level() != level)){
-        _parent = optr;
-      }else{
-        _parent = optr->parent(level,stopatfirst);
-      }
+      setAsSubset(optr,level,stopatfirst);
     } else {
       throw cet::exception("RECO")<<"mu2e::ComboHitCollection: invalid handle" << std::endl;
     }
   }
-
-
   void ComboHitCollection::setAsSubset(art::Handle<ComboHitCollection> const& ohandle, StrawIdMask::Level level, bool stopatfirst){
     auto optr = CHCPTR(ohandle);
+    setAsSubset(optr,level,stopatfirst);
+  }
+  void ComboHitCollection::setAsSubset(CHCPTR const& optr, StrawIdMask::Level level, bool stopatfirst){
     if (optr->level() == level && (stopatfirst || optr->parent().refCore().isNull() || optr->parent()->level() != level)){
       _parent = optr;
     }else{