Fork me on GitHub

Changeset 6965fe1 in git


Ignore:
Timestamp:
Dec 5, 2017, 8:33:29 PM (7 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
8d4d51b
Parents:
ba75867 (diff), dda357d (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.
Message:

Merge branch 'master' of github.com:delphes/delphes

Files:
9 added
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rba75867 r6965fe1  
    12571257        external/fastjet/Voronoi.$(SrcSuf) \
    12581258        external/fastjet/internal/Voronoi.hh
     1259tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
     1260        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf)
    12591261tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
    12601262        external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
    … …  
    14171419        external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
    14181420        external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
     1421        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
    14191422        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
    14201423        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    … …  
    14441447        external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
    14451448        external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
     1449        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
    14461450        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
    14471451        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    … …  
    15011505        tmp/external/fastjet/TilingExtent.$(ObjSuf) \
    15021506        tmp/external/fastjet/Voronoi.$(ObjSuf) \
     1507        tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
    15031508        tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
    15041509        tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
    … …  
    18941899        @touch $@
    18951900
     1901
     1902external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
     1903        external/fastjet/JetDefinition.hh \
     1904        external/fastjet/ClusterSequence.hh
     1905        @touch $@
     1906
    18961907external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
    18971908        external/fastjet/ClusterSequence.hh \

  • cards/delphes_card_CMS.tcl

    rba75867 r6965fe1  
    169169
    170170  # resolution formula for electrons
    171   # based on arXiv:1405.6569
     171  # based on arXiv:1502.02701
    172172  set ResolutionFormula {                  (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.03^2 + pt^2*1.3e-3^2) +
    173173                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.05^2 + pt^2*1.7e-3^2) +

  • modules/FastJetFinder.cc

    rba75867 r6965fe1  
    6666#include "fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh"
    6767
     68#include "fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh"
     69
    6870#include "fastjet/tools/Filter.hh"
    6971#include "fastjet/tools/Pruner.hh"
    … …  
    7981FastJetFinder::FastJetFinder() :
    8082  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0),
    81   fDefinition(0), fAreaDefinition(0), fItInputArray(0)
     83  fDefinition(0), fAreaDefinition(0), fItInputArray(0), fValenciaPlugin(0)
    8284{
    8385
    … …  
    118120  fJetPTMin = GetDouble("JetPTMin", 10.0);
    119121
     122 
    120123  //-- N(sub)jettiness parameters --
    121124
    … …  
    125128  fRcutOff = GetDouble("RcutOff", 0.8); // used only if Njettiness is used as jet clustering algo (case 8)
    126129  fN = GetInt("N", 2);                  // used only if Njettiness is used as jet clustering algo (case 8)
    127      
     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 
    128140  fMeasureDef = new NormalizedMeasure(fBeta, fParameterR);
    129141   
    … …  
    236248      fDefinition = new JetDefinition(fNjettinessPlugin);
    237249      break;
     250  case 9:
     251      fValenciaPlugin = new ValenciaPlugin(fParameterR, fBeta, fGamma);
     252      fDefinition = new JetDefinition(fValenciaPlugin);
     253      break;
     254
    238255  }
    239256
    … …  
    294311  if(fAxesDef) delete fAxesDef;
    295312  if(fMeasureDef) delete fMeasureDef;
     313  if(fValenciaPlugin) delete static_cast<JetDefinition::Plugin*>(fValenciaPlugin);
     314
    296315}
    297316
    … …  
    357376
    358377  outputList.clear();
    359   outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
    360 
     378
     379  if(fExclusiveClustering)
     380    {
     381      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
     382    }
     383  else
     384    {
     385      outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
     386    }
    361387
    362388  // loop over all jets and export them

  • modules/FastJetFinder.h

    rba75867 r6965fe1  
    4141  namespace contrib {
    4242    class NjettinessPlugin;
     43    class ValenciaPlugin;
    4344    class AxesDefinition;
    4445    class MeasureDefinition;   
    … …  
    6162  void *fPlugin; //!
    6263  void *fRecomb; //!
     64
     65  fastjet::contrib::AxesDefinition *fAxesDef;
     66  fastjet::contrib::MeasureDefinition *fMeasureDef;   
     67
    6368  fastjet::contrib::NjettinessPlugin *fNjettinessPlugin; //!
    64 
     69  fastjet::contrib::ValenciaPlugin *fValenciaPlugin; //!
    6570  fastjet::JetDefinition *fDefinition; //!
    6671
    6772  Int_t fJetAlgorithm;
    6873  Double_t fParameterR;
     74
    6975  Double_t fJetPTMin;
    7076  Double_t fConeRadius;
    … …  
    7783  Double_t fOverlapThreshold;
    7884
     85  //-- Exclusive clustering for e+e- collisions --
     86
     87  Int_t fNJets;
     88  Bool_t fExclusiveClustering;
     89
     90  //-- Valencia Linear Collider algorithm
     91  Double_t fGamma;
     92 
    7993  //-- N (sub)jettiness parameters --
    8094
    8195  Bool_t fComputeNsubjettiness;
    82   fastjet::contrib::AxesDefinition *fAxesDef;
    83   fastjet::contrib::MeasureDefinition *fMeasureDef;   
    8496  Double_t fBeta;
    8597  Int_t fAxisMode;
Note: See TracChangeset for help on using the changeset viewer.