Changeset 70bb4cb in git
- Timestamp:
- Jan 22, 2019, 5:04:07 PM (6 years ago)
- Branches:
- ImprovedOutputFile, Timing, llp, master
- Children:
- 8a11cdc
- Parents:
- 3b3d0ad
- Location:
- modules
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/FastJetFinder.cc
r3b3d0ad r70bb4cb 290 290 fOutputArray = ExportArray(GetString("OutputArray", "jets")); 291 291 fRhoOutputArray = ExportArray(GetString("RhoOutputArray", "rho")); 292 fConstituentsOutputArray = ExportArray(GetString("ConstituentsOutputArray", "constituents")); 292 293 } 293 294 … … 446 447 charge += constituent->Charge; 447 448 449 fConstituentsOutputArray->Add(constituent); 448 450 candidate->AddCandidate(constituent); 449 451 } -
modules/FastJetFinder.h
r3b3d0ad r70bb4cb 152 152 TObjArray *fOutputArray; //! 153 153 TObjArray *fRhoOutputArray; //! 154 TObjArray *fConstituentsOutputArray; //! 154 155 155 156 ClassDef(FastJetFinder, 1) -
modules/UniqueObjectFinder.cc
r3b3d0ad r70bb4cb 67 67 void UniqueObjectFinder::Init() 68 68 { 69 // use GetUniqueID algorithm to find unique objects (faster than the default Overlaps method) 70 fUseUniqueID = GetBool("UseUniqueID", false); 71 69 72 // import arrays with output from other modules 70 73 … … 146 149 while((previousCandidate = static_cast<Candidate*>(iterator.Next()))) 147 150 { 148 if( candidate->Overlaps(previousCandidate))151 if(fUseUniqueID) 149 152 { 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 } 151 164 } 152 165 } -
modules/UniqueObjectFinder.h
r3b3d0ad r70bb4cb 50 50 private: 51 51 52 Bool_t fUseUniqueID; 53 52 54 Bool_t Unique(Candidate *candidate, std::vector< std::pair< TIterator *, TObjArray * > >::iterator itInputMap); 53 55
Note:
See TracChangeset
for help on using the changeset viewer.