Fork me on GitHub

Changeset 70bb4cb in git for modules


Ignore:
Timestamp:
Jan 22, 2019, 5:04:07 PM (6 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
8a11cdc
Parents:
3b3d0ad
Message:

add possibility to calculate MET with smeared jets

Location:
modules
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • modules/FastJetFinder.cc

    r3b3d0ad r70bb4cb  
    290290  fOutputArray = ExportArray(GetString("OutputArray", "jets"));
    291291  fRhoOutputArray = ExportArray(GetString("RhoOutputArray", "rho"));
     292  fConstituentsOutputArray = ExportArray(GetString("ConstituentsOutputArray", "constituents"));
    292293}
    293294
     
    446447      charge += constituent->Charge;
    447448
     449      fConstituentsOutputArray->Add(constituent);
    448450      candidate->AddCandidate(constituent);
    449451    }
  • modules/FastJetFinder.h

    r3b3d0ad r70bb4cb  
    152152  TObjArray *fOutputArray; //!
    153153  TObjArray *fRhoOutputArray; //!
     154  TObjArray *fConstituentsOutputArray; //!
    154155
    155156  ClassDef(FastJetFinder, 1)
  • modules/UniqueObjectFinder.cc

    r3b3d0ad r70bb4cb  
    6767void UniqueObjectFinder::Init()
    6868{
     69  // use GetUniqueID algorithm to find unique objects (faster than the default Overlaps method)
     70  fUseUniqueID = GetBool("UseUniqueID", false);
     71
    6972  // import arrays with output from other modules
    7073
     
    146149    while((previousCandidate = static_cast<Candidate*>(iterator.Next())))
    147150    {
    148       if(candidate->Overlaps(previousCandidate))
     151      if(fUseUniqueID)
    149152      {
    150         return kFALSE;
     153        if(candidate->GetUniqueID() == previousCandidate->GetUniqueID())
     154        {
     155          return kFALSE;
     156        }
     157      }
     158      else
     159      {
     160        if(candidate->Overlaps(previousCandidate))
     161        {
     162          return kFALSE;
     163        }
    151164      }
    152165    }
  • modules/UniqueObjectFinder.h

    r3b3d0ad r70bb4cb  
    5050private:
    5151
     52  Bool_t fUseUniqueID;
     53
    5254  Bool_t Unique(Candidate *candidate, std::vector< std::pair< TIterator *, TObjArray * > >::iterator itInputMap);
    5355
Note: See TracChangeset for help on using the changeset viewer.