Merge pull request #8 from lgray/pyVID_and_newIDs_74X

add bitmap to VID output - the order of bits is the order of the cuts…

Author: ikrav

PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h

@@ -35,7 +35,8 @@ class VersionedIdProducer : public edm::stream::EDProducer<> {
   bool verbose_;
   TokenType physicsObjectSrc_;
 
-  std::vector<std::unique_ptr<SelectorType> > ids_;  
+  std::vector<std::unique_ptr<SelectorType> > ids_;
+
 };
 
 //
@@ -52,6 +53,8 @@ class VersionedIdProducer : public edm::stream::EDProducer<> {
 template< class PhysicsObjectPtr , class SelectorType >
 VersionedIdProducer<PhysicsObjectPtr,SelectorType>::
 VersionedIdProducer(const edm::ParameterSet& iConfig) {
+  constexpr char bitmap_label[] = "_bitmap";
+  
   verbose_ = iConfig.getUntrackedParameter<bool>("verbose", false);
 
   physicsObjectSrc_ = 
@@ -102,16 +105,21 @@ VersionedIdProducer(const edm::ParameterSet& iConfig) {
     edm::LogWarning("IdInformation")
       << idmsg.str();
 
+    
+
     produces<std::string>(idname);
     produces<edm::ValueMap<bool> >(idname);
     produces<edm::ValueMap<float> >(idname); // for PAT
-    produces<edm::ValueMap<unsigned> >(idname);
+    produces<edm::ValueMap<unsigned> >(idname);  
+    produces<edm::ValueMap<unsigned> >(idname+std::string(bitmap_label));
   }
 }
 
 template< class PhysicsObjectPtr , class SelectorType >
 void VersionedIdProducer<PhysicsObjectPtr,SelectorType>::
 produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  constexpr char bitmap_label[] = "_bitmap";
+  
   edm::Handle<Collection> physicsObjectsHandle;
   iEvent.getByToken(physicsObjectSrc_,physicsObjectsHandle);
 
@@ -121,14 +129,17 @@ produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
     std::auto_ptr<edm::ValueMap<bool> > outPass(new edm::ValueMap<bool>() );
     std::auto_ptr<edm::ValueMap<float> > outPassf(new edm::ValueMap<float>() );
     std::auto_ptr<edm::ValueMap<unsigned> > outHowFar(new edm::ValueMap<unsigned>() );
+    std::auto_ptr<edm::ValueMap<unsigned> > outBitmap(new edm::ValueMap<unsigned>() );
     std::vector<bool> passfail;
     std::vector<float> passfailf;
     std::vector<unsigned> howfar;
+    std::vector<unsigned> bitmap;
     for(size_t i = 0; i < physicsobjects.size(); ++i) {
       auto po = physicsobjects.ptrAt(i);
       passfail.push_back((*id)(po,iEvent));
       passfailf.push_back(passfail.back());
       howfar.push_back(id->howFarInCutFlow());
+      bitmap.push_back(id->bitMap());
     }
 
     edm::ValueMap<bool>::Filler fillerpassfail(*outPass);
@@ -143,11 +154,17 @@ produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
     fillerhowfar.insert(physicsObjectsHandle, howfar.begin(), howfar.end() );
     fillerhowfar.fill();  
 
+    edm::ValueMap<unsigned>::Filler fillerbitmap(*outBitmap);
+    fillerbitmap.insert(physicsObjectsHandle, bitmap.begin(), bitmap.end() );
+    fillerbitmap.fill(); 
+
     iEvent.put(outPass,id->name());
     iEvent.put(outPassf,id->name());
     iEvent.put(outHowFar,id->name());
+    iEvent.put(outBitmap,id->name()+std::string(bitmap_label));
     iEvent.put(std::auto_ptr<std::string>(new std::string(id->md5String())),
 	       id->name());
+    
   }   
 }
 

PhysicsTools/SelectorUtils/interface/VersionedSelector.h

@@ -59,6 +59,7 @@ class VersionedSelector : public Selector<T> {
 
   virtual bool operator()( const T& ref, pat::strbitset& ret ) override final {
     howfar_ = 0;
+    bitmap_ = 0;
     bool failed = false;
     if( !initialized_ ) {
       throw cms::Exception("CutNotInitialized")
@@ -69,6 +70,7 @@ class VersionedSelector : public Selector<T> {
       const bool result = (*cuts_[i])(temp);
       if( result || this->ignoreCut(cut_indices_[i]) ) {
 	this->passCut(ret,cut_indices_[i]);
+        bitmap_ |= 1<<i;
 	if( !failed ) ++howfar_;
       } else {
 	failed = true;
@@ -117,6 +119,8 @@ class VersionedSelector : public Selector<T> {
   const std::string& name() const { return name_; }
 
   const unsigned howFarInCutFlow() const { return howfar_; }
+  
+  const unsigned bitMap() const { return bitmap_; }
 
   const size_t cutFlowSize() const { return cuts_.size(); } 
 
@@ -129,7 +133,7 @@ class VersionedSelector : public Selector<T> {
   std::vector<std::shared_ptr<candf::CandidateCut> > cuts_;
   std::vector<bool> needs_event_content_;
   std::vector<typename Selector<T>::index_type> cut_indices_;
-  unsigned howfar_;
+  unsigned howfar_, bitmap_;
 
  private:  
   unsigned char id_md5_[MD5_DIGEST_LENGTH];