- Timestamp:
- Apr 11, 2018, 6:26:41 PM (7 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 58cfe91, 900ad95
- Parents:
- a670493 (diff), b1d948c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Michele Selvaggi <michele.selvaggi@…> (04/11/18 18:26:41)
- git-committer:
- GitHub <noreply@…> (04/11/18 18:26:41)
- Location:
- modules
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/FastJetFinder.cc
ra670493 r8c3ac78 80 80 81 81 FastJetFinder::FastJetFinder() : 82 fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 83 fDefinition(0), fAreaDefinition(0), fItInputArray(0) , fValenciaPlugin(0)82 fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), fValenciaPlugin(0), 83 fDefinition(0), fAreaDefinition(0), fItInputArray(0) 84 84 { 85 85 … … 332 332 vector< PseudoJet >::iterator itInputList, itOutputList; 333 333 vector< TEstimatorStruct >::iterator itEstimators; 334 334 Double_t excl_ymerge23 = 0.0; 335 Double_t excl_ymerge34 = 0.0; 336 Double_t excl_ymerge45 = 0.0; 337 Double_t excl_ymerge56 = 0.0; 338 335 339 DelphesFactory *factory = GetFactory(); 336 340 … … 377 381 outputList.clear(); 378 382 383 379 384 if(fExclusiveClustering) 380 385 { 381 outputList = sorted_by_pt(sequence->exclusive_jets( fNJets )); 386 try{ 387 outputList = sorted_by_pt(sequence->exclusive_jets( fNJets )); 388 } 389 catch(fastjet::Error) 390 { 391 outputList.clear(); 392 } 393 394 excl_ymerge23 = sequence->exclusive_ymerge( 2 ); 395 excl_ymerge34 = sequence->exclusive_ymerge( 3 ); 396 excl_ymerge45 = sequence->exclusive_ymerge( 4 ); 397 excl_ymerge56 = sequence->exclusive_ymerge( 5 ); 382 398 } 383 399 else … … 400 416 if(fAreaDefinition) area = itOutputList->area_4vector(); 401 417 418 419 402 420 candidate = factory->NewCandidate(); 403 421 … … 443 461 candidate->NNeutrals = nneutrals; 444 462 candidate->NCharged = ncharged; 463 464 465 //for exclusive clustering, access y_n,n+1 as exclusive_ymerge (fNJets); 466 candidate->ExclYmerge23 = excl_ymerge23; 467 candidate->ExclYmerge34 = excl_ymerge34; 468 candidate->ExclYmerge45 = excl_ymerge45; 469 candidate->ExclYmerge56 = excl_ymerge56; 445 470 446 471 //------------------------------------ -
modules/TreeWriter.cc
ra670493 r8c3ac78 696 696 } 697 697 698 //--- exclusive clustering variables --- 699 entry->ExclYmerge23 = candidate->ExclYmerge23; 700 entry->ExclYmerge34 = candidate->ExclYmerge34; 701 entry->ExclYmerge45 = candidate->ExclYmerge45; 702 entry->ExclYmerge56 = candidate->ExclYmerge56; 703 704 698 705 FillParticles(candidate, &entry->Particles); 699 706 }
Note:
See TracChangeset
for help on using the changeset viewer.