Changes in modules/FastJetFinder.cc [e9c0d73:ba75867] in git
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/FastJetFinder.cc
re9c0d73 rba75867 66 66 #include "fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh" 67 67 68 #include "fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh"69 70 68 #include "fastjet/tools/Filter.hh" 71 69 #include "fastjet/tools/Pruner.hh" … … 80 78 81 79 FastJetFinder::FastJetFinder() : 82 fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), fValenciaPlugin(0),80 fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 83 81 fDefinition(0), fAreaDefinition(0), fItInputArray(0) 84 82 { … … 120 118 fJetPTMin = GetDouble("JetPTMin", 10.0); 121 119 122 123 120 //-- N(sub)jettiness parameters -- 124 121 … … 128 125 fRcutOff = GetDouble("RcutOff", 0.8); // used only if Njettiness is used as jet clustering algo (case 8) 129 126 fN = GetInt("N", 2); // used only if Njettiness is used as jet clustering algo (case 8) 130 131 //-- Exclusive clustering for e+e- collisions -- 132 133 fNJets = GetInt("NJets",2); 134 fExclusiveClustering = GetBool("ExclusiveClustering", false); 135 136 //-- Valencia Linear Collider algorithm 137 fGamma = GetDouble("Gamma", 1.0); 138 //fBeta parameter see above 139 127 140 128 fMeasureDef = new NormalizedMeasure(fBeta, fParameterR); 141 129 … … 248 236 fDefinition = new JetDefinition(fNjettinessPlugin); 249 237 break; 250 case 9:251 fValenciaPlugin = new ValenciaPlugin(fParameterR, fBeta, fGamma);252 fDefinition = new JetDefinition(fValenciaPlugin);253 break;254 255 238 } 256 239 … … 311 294 if(fAxesDef) delete fAxesDef; 312 295 if(fMeasureDef) delete fMeasureDef; 313 if(fValenciaPlugin) delete static_cast<JetDefinition::Plugin*>(fValenciaPlugin);314 315 296 } 316 297 … … 332 313 vector< PseudoJet >::iterator itInputList, itOutputList; 333 314 vector< TEstimatorStruct >::iterator itEstimators; 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 315 339 316 DelphesFactory *factory = GetFactory(); 340 317 … … 380 357 381 358 outputList.clear(); 382 383 384 if(fExclusiveClustering) 385 { 386 outputList = sorted_by_pt(sequence->exclusive_jets( fNJets )); 387 388 excl_ymerge23 = sequence->exclusive_ymerge( 2 ); 389 excl_ymerge34 = sequence->exclusive_ymerge( 3 ); 390 excl_ymerge45 = sequence->exclusive_ymerge( 4 ); 391 excl_ymerge56 = sequence->exclusive_ymerge( 5 ); 392 } 393 else 394 { 395 outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin)); 396 } 359 outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin)); 360 397 361 398 362 // loop over all jets and export them … … 410 374 if(fAreaDefinition) area = itOutputList->area_4vector(); 411 375 412 413 414 376 candidate = factory->NewCandidate(); 415 377 … … 455 417 candidate->NNeutrals = nneutrals; 456 418 candidate->NCharged = ncharged; 457 458 459 //for exclusive clustering, access y_n,n+1 as exclusive_ymerge (fNJets);460 candidate->ExclYmerge23 = excl_ymerge23;461 candidate->ExclYmerge34 = excl_ymerge34;462 candidate->ExclYmerge45 = excl_ymerge45;463 candidate->ExclYmerge56 = excl_ymerge56;464 419 465 420 //------------------------------------ … … 539 494 candidate->NSubJetsSoftDropped = softdrop_jet.pieces().size(); 540 495 496 candidate->SoftDroppedJet = candidate->SoftDroppedP4[0]; 497 541 498 for (size_t i = 0; i < subjets.size() and i < 4; i++) 542 499 { 543 500 if(subjets.at(i).pt() < 0) continue ; 544 501 candidate->SoftDroppedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m()); 502 if(i==0) candidate->SoftDroppedSubJet1 = candidate->SoftDroppedP4[i+1]; 503 if(i==1) candidate->SoftDroppedSubJet2 = candidate->SoftDroppedP4[i+1]; 545 504 } 546 505 }
Note:
See TracChangeset
for help on using the changeset viewer.