Merge pull request #130 from yiiyama/master

It doesn't seem to change anything for me in Hbb no leptons either.

Author: Daniel Abercrombie

Objects/interface/EventBase.h

@@ -77,7 +77,7 @@ namespace panda {
      * By default, all trigger objects are loaded into the triggerObjects map at each call to getEntry.
      * Once a call to this function is made, only the objects for the registered filter will be loaded.
      */
-    void registerTriggerObjects(char const* filter) { registeredTriggerFilters_.emplace_back(filter); }
+    void registerTriggerObjects(char const* filter) { triggerObjects.registerFilter(filter); }
 
     //! Repeatable random number generator, initialized to be empty
     RRNG rng{0,0,nullptr};
@@ -95,12 +95,6 @@ namespace panda {
      */
     std::map<TTree*, std::pair<Int_t, TTree*>> runTrees_;
 
-    //! List of trigger object filter names to use
-    std::vector<TString> registeredTriggerFilters_{};
-
-    //! Trigger filter mask generated from registeredTriggerFilters for each run
-    std::vector<bool> triggerFilterMask_{};
-
     /* END CUSTOM */
   };
 

Objects/interface/HLTObjectStore.h

@@ -22,15 +22,33 @@ namespace panda {
     void setFilterObjectKeys(std::vector<TString> const& filters);
 
     //! Fill the filterObjects map for each event. Not to be called by users.
-    void makeMap(std::vector<bool> const& mask);
+    void makeMap();
+
+    //! Use to declare a trigger filter name (key in the triggerObjects map) to be used in the analysis.
+    /*!
+     * By default, all trigger objects are loaded into the triggerObjects map at each call to getEntry.
+     * Once a call to this function is made, only the objects for the registered filter will be loaded.
+     */
+    void registerFilter(char const* filter) { registeredFilters_.emplace(filter); }
+
+    //! If set to true, return an empty vector when non-existent filter is asked for
+    void setIgnoreMissing(Bool_t b) { ignoreMissing_ = b; }
 
     //! filterObjects_.at() with warnings. To be called by users.
     HLTObjectVector const& filterObjects(char const* filter) const;
 
   protected:
-    std::map<TString, HLTObjectVector> filterObjects_{};
-    //! internal-use pointers to the values of filterObjects_
-    std::vector<HLTObjectVector*> objectVectors_{};
+    Bool_t ignoreMissing_{false};
+    //! List of trigger object filter names to use
+    std::set<TString> registeredFilters_{};
+    //! Map from filter name to the outer index of objectVectors
+    std::map<TString, UInt_t> nameToSlot_{};
+    //! Map from filter index to objectVectors slot
+    std::vector<Int_t> indexToSlot_{};
+    //! Vector of vector of pointers to the objects. Outer index for filters
+    std::vector<HLTObjectVector> objectVectors_{};
+    //! Empty vector as a return value to filterObjects when ignoreMissing is true
+    static HLTObjectVector const emptyVector_;
   };
 
 }

Objects/src/EventBase.cc

@@ -48,6 +48,8 @@ panda::EventBase::operator=(EventBase const& _src)
   rng = _src.rng;
   rng.setSeedAddress(&eventNumber);
   triggerObjects = _src.triggerObjects;
+
+  readRunTree_ = _src.readRunTree_;
   /* END CUSTOM */
 
   runNumber = _src.runNumber;
@@ -223,7 +225,7 @@ panda::EventBase::doGetEntry_(TTree& _tree)
   }
 
   if (triggerObjects.size() != 0 && run.hlt.filters)
-    triggerObjects.makeMap(triggerFilterMask_);
+    triggerObjects.makeMap();
 
   rng.generate();
 
@@ -266,27 +268,10 @@ panda::EventBase::triggerFired(UInt_t _token) const
 void
 panda::EventBase::setTriggerFilters_()
 {
+  if (triggerObjects.size() == 0 || !run.hlt.filters)
+    return;
 
-  if (triggerObjects.size() != 0 && run.hlt.filters) {
-    triggerObjects.setFilterObjectKeys(*run.hlt.filters);
-
-    if (registeredTriggerFilters_.empty()) {
-      // if no filters are registered, don't mask
-      triggerFilterMask_.resize(run.hlt.filters->size(), true);
-    }
-    else {
-      // else only allow the registered filters
-      triggerFilterMask_.resize(run.hlt.filters->size(), false);
-      for (unsigned fidx(0); fidx != run.hlt.filters->size(); ++fidx) {
-        for (auto& filter : registeredTriggerFilters_) {
-          if (filter == run.hlt.filters->at(fidx)) {
-            triggerFilterMask_[fidx] = true;
-            break;
-          }
-        }
-      }
-    }
-  }
+  triggerObjects.setFilterObjectKeys(*run.hlt.filters);
 }
 
 /* END CUSTOM */

Objects/src/EventMonophoton.cc

@@ -304,6 +304,7 @@ panda::EventMonophoton::copy(Event const& _src)
   weight = _src.weight;
 
   triggers = _src.triggers;
+  triggerObjects = _src.triggerObjects;
 
   npv = _src.npv;
   npvTrue = _src.npvTrue;

Objects/src/HLTObjectStore.cc

@@ -1,18 +1,18 @@
 #include "../interface/HLTObjectStore.h"
 
+/*static*/
+panda::HLTObjectStore::HLTObjectVector const panda::HLTObjectStore::emptyVector_{};
+
 panda::HLTObjectStore::HLTObjectStore(HLTObjectStore const& _src) :
   HLTObjectCollection(_src)
 {
-  for (auto& fo : _src.filterObjects_) {
-    HLTObjectVector myVector;
-    for (auto* obj : fo.second) {
-      for (unsigned iO(0); iO != _src.size(); ++iO) {
-        if (&(_src[iO]) == obj)
-          myVector.push_back(&at(iO));
-      }
-    }
+  nameToSlot_ = _src.nameToSlot_;
+  objectVectors_.resize(_src.objectVectors_.size());
 
-    filterObjects_.emplace(fo.first, myVector);
+  for (UInt_t fidx(0); fidx != _src.objectVectors_.size(); ++fidx) {
+    objectVectors_[fidx].clear();
+    for (auto* obj : _src.objectVectors_[fidx])
+      objectVectors_[fidx].push_back(&at(obj - &_src.at(0)));
   }
 }
 
@@ -21,18 +21,14 @@ panda::HLTObjectStore::operator=(HLTObjectStore const& _rhs)
 {
   HLTObjectCollection::operator=(_rhs);
 
-  filterObjects_.clear();
+  registeredFilters_ = _rhs.registeredFilters_;
+  nameToSlot_ = _rhs.nameToSlot_;
+  objectVectors_.resize(_rhs.objectVectors_.size());
 
-  for (auto& fo : _rhs.filterObjects_) {
-    HLTObjectVector myVector;
-    for (auto* obj : fo.second) {
-      for (unsigned iO(0); iO != _rhs.size(); ++iO) {
-        if (&(_rhs[iO]) == obj)
-          myVector.push_back(&at(iO));
-      }
-    }
-
-    filterObjects_.emplace(fo.first, myVector);
+  for (UInt_t fidx(0); fidx != _rhs.objectVectors_.size(); ++fidx) {
+    objectVectors_[fidx].clear();
+    for (auto* obj : _rhs.objectVectors_[fidx])
+      objectVectors_[fidx].push_back(&at(obj - &_rhs.at(0)));
   }
 
   return *this;
@@ -41,36 +37,57 @@ panda::HLTObjectStore::operator=(HLTObjectStore const& _rhs)
 void
 panda::HLTObjectStore::setFilterObjectKeys(std::vector<TString> const& _filters)
 {
-  filterObjects_.clear();
-  if (_filters.size() > objectVectors_.size())
+  nameToSlot_.clear();
+
+  if (registeredFilters_.empty()) {
+    // all filters are used
     objectVectors_.resize(_filters.size());
+    indexToSlot_.resize(_filters.size());
 
-  for (UShort_t fidx(0); fidx != _filters.size(); ++fidx)
-    objectVectors_[fidx] = &filterObjects_[_filters[fidx]];
+    for (UShort_t fidx(0); fidx != _filters.size(); ++fidx) {
+      nameToSlot_[_filters[fidx]] = fidx;
+      indexToSlot_[fidx] = fidx;
+    }
+  }
+  else {
+    indexToSlot_.assign(_filters.size(), -1);
+
+    // only allow registered filters
+    int slot(0);
+    for (UShort_t fidx(0); fidx != _filters.size(); ++fidx) {
+      auto& filter(_filters[fidx]);
+      if (registeredFilters_.count(filter) != 0) {
+        indexToSlot_[fidx] = slot;
+        nameToSlot_[filter] = slot++;
+      }
+    }
+
+    objectVectors_.resize(slot);
+  }
 }
 
 void
-panda::HLTObjectStore::makeMap(std::vector<bool> const& _mask)
+panda::HLTObjectStore::makeMap()
 {
-  for (auto* objv : objectVectors_)
-    objv->clear();
+  for (auto& objv : objectVectors_)
+    objv.clear();
 
   for (auto& obj : *this) {
     for (UShort_t fidx : *obj.filters) {
-      if (fidx < _mask.size()) {
-        if (_mask[fidx])
-          objectVectors_[fidx]->push_back(&obj);
-      }
-      else
+      if (fidx >= indexToSlot_.size())
         throw std::runtime_error(TString::Format("Invalid trigger filter index %d found in trigger objects. There is very likely a bug in HLTObjectStore or EventBase.", fidx).Data());
+
+      int slot(indexToSlot_[fidx]);
+      if (slot >= 0)
+        objectVectors_[slot].push_back(&obj);
     }
   }
 }
 
 panda::HLTObjectStore::HLTObjectVector const&
 panda::HLTObjectStore::filterObjects(char const* _filter) const
 {
-  if (filterObjects_.empty()) {
+  if (nameToSlot_.empty()) {
     std::cerr << "  HLTObjectStore has no filter objects. Store is filled by a call to makeMap(),"
               << "   which is executed in EventBase::doGetEntry_ if the following conditions are met:\n"
               << "   1.  runNumber branch is read in Event\n"
@@ -82,9 +99,12 @@ panda::HLTObjectStore::filterObjects(char const* _filter) const
   }
 
   try {
-    return filterObjects_.at(_filter);
+    return objectVectors_[nameToSlot_.at(_filter)];
   }
   catch (std::out_of_range& ex) {
+    if (ignoreMissing_)
+      return emptyVector_;
+
     std::cerr << "Unknown HLT filter " << _filter << std::endl;
     throw;
   }