Fork me on GitHub

Changeset db316cd in git


Ignore:
Timestamp:
May 24, 2021, 3:31:22 PM (4 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
master
Children:
7e6c201, b03c0d0, f76741a
Parents:
f8e61b2 (diff), fa0b54e (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 https://github.com/delphes/delphes

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cards/delphes_card_IDEA.tcl

    rf8e61b2 rdb316cd  
    6868  TauTagging
    6969
    70   UniqueObjectFinder
    71 
    72   ScalarHT
    7370  TreeWriter
    7471}
     
    8077module TruthVertexFinder TruthVertexFinder {
    8178
    82   ## below this distance two vertices are assumed to be the same
     79  ## below this distance two vertices are assumed to be merged
    8380  set Resolution 1E-06
    8481
     
    116113    set InputArray ParticlePropagator/chargedHadrons
    117114    set OutputArray chargedHadrons
     115    set UseMomentumVector true
     116
    118117    # We use only one efficiency, we set only 0 effincency out of eta bounds:
    119118
    120119    set EfficiencyFormula {
    121120        (abs(eta) > 3.0)                                       * (0.000) +
    122         (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
    123         (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
    124         (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     121        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
     122        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
     123        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
    125124    }
    126125}
     
    135134    set InputArray ParticlePropagator/electrons
    136135    set OutputArray electrons
    137 
     136    set UseMomentumVector true
    138137
    139138    # Current full simulation with CLICdet provides for electrons:
    140139    set EfficiencyFormula {
    141140        (abs(eta) > 3.0)                                       * (0.000) +
    142         (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
    143         (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
    144         (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     141        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
     142        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
     143        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
    145144    }
    146145}
     
    154153    set InputArray ParticlePropagator/muons
    155154    set OutputArray muons
     155    set UseMomentumVector true
    156156
    157157    # Current full simulation with CLICdet provides for muons:
    158158    set EfficiencyFormula {
    159159        (abs(eta) > 3.0)                                       * (0.000) +
    160         (energy >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
    161         (energy < 0.5 && energy >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
    162         (energy < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
     160        (pt >= 0.5) * (abs(eta) <= 3.0)                    * (0.997) +
     161        (pt < 0.5 && pt >= 0.3) * (abs(eta) <= 3.0)    * (0.65) +
     162        (pt < 0.3) * (abs(eta) <= 3.0)                     * (0.06)
    163163    }
    164164}
     
    417417
    418418  # 0: assume vertex time tV from MC Truth (ideal case)
    419   # 1: assume vertex time tV=0
     419  # 1: assume vertex time tV = 0
    420420  # 2: calculate vertex time as vertex TOF, assuming tPV=0
     421
    421422  set VertexTimeMode 2
    422 
    423 }
    424 
     423}
    425424
    426425##############
     
    721720module FastJetFinder GenJetFinder {
    722721  set InputArray NeutrinoFilter/filteredParticles
    723 
    724722  set OutputArray jets
    725723
    726   # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    727   set JetAlgorithm 6
    728   set ParameterR 0.4
     724  set JetAlgorithm 10
     725  set ParameterR 1.5
     726  set ParameterP -1.0
    729727  set JetPTMin 1.0
     728
    730729}
    731730
     
    752751
    753752  # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    754   set JetAlgorithm 6
    755   set ParameterR 0.4
     753  set JetAlgorithm 10
     754  set ParameterR 1.5
     755  set ParameterP -1.0
    756756  set JetPTMin 1.0
     757
     758
    757759}
    758760
     
    766768
    767769  # scale formula for jets
    768   set ScaleFormula {1.08}
     770  set ScaleFormula {1.00}
    769771}
    770772
     
    826828
    827829
    828 #####################################################
    829 # Find uniquely identified photons/electrons/tau/jets
    830 #####################################################
    831 
    832 module UniqueObjectFinder UniqueObjectFinder {
    833 
    834   set UseUniqueID true
    835 # earlier arrays take precedence over later ones
    836 # add InputArray InputArray OutputArray
    837   add InputArray PhotonIsolation/photons photons
    838   add InputArray ElectronIsolation/electrons electrons
    839   add InputArray MuonIsolation/muons muons
    840   add InputArray JetEnergyScale/jets jets
    841 }
    842 
    843830
    844831##################
     
    854841
    855842    add Branch Delphes/allParticles Particle GenParticle
     843    add Branch TruthVertexFinder/vertices GenVertex Vertex
    856844
    857845    add Branch TrackMerger/tracks Track Track
     
    862850    add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
    863851
     852    add Branch EFlowMerger/eflow ParticleFlowCandidate ParticleFlowCandidate
     853
    864854    add Branch Calorimeter/photons CaloPhoton Photon
    865855    add Branch PhotonEfficiency/photons PhotonEff Photon
     
    869859    add Branch GenMissingET/momentum GenMissingET MissingET
    870860
    871     add Branch UniqueObjectFinder/jets Jet Jet
    872     add Branch UniqueObjectFinder/electrons Electron Electron
    873     add Branch UniqueObjectFinder/photons Photon Photon
    874     add Branch UniqueObjectFinder/muons Muon Muon
    875 
    876     add Branch JetEnergyScale/jets AntiKtJet Jet
     861    add Branch JetEnergyScale/jets Jet Jet
     862    add Branch ElectronIsolation/electrons Electron Electron
     863    add Branch PhotonIsolation/photons Photon Photon
     864    add Branch MuonIsolation/muons Muon Muon
    877865
    878866    add Branch MissingET/momentum MissingET MissingET
    879     add Branch ScalarHT/energy ScalarHT ScalarHT
    880867
    881868    # add Info InfoName InfoValue
  • modules/TimeOfFlight.cc

    rf8e61b2 rdb316cd  
    164164        }
    165165
    166 
    167     //ti = ti - t_truth;
    168 
    169166    p = candidateMomentum.P();
    170167
     
    190187    candidate->InitialPosition.SetT(ti * 1.0E3 * c_light);
    191188
    192     // update particle mass based on TOF-based PID
    193     candidate->Momentum.SetVectM(candidateMomentum.Vect(), mass);
     189    // update particle mass based on TOF-based PID (commented for now, assume this calculation is done offline)
     190    //candidate->Momentum.SetVectM(candidateMomentum.Vect(), mass);
    194191
    195192    candidate->AddCandidate(mother);
  • modules/TimeSmearing.cc

    rf8e61b2 rdb316cd  
    103103  while((candidate = static_cast<Candidate *>(fItTrackInputArray->Next())))
    104104  {
    105     // converting to meters
     105
    106106    const TLorentzVector &candidateFinalPosition = candidate->Position;
    107107    const TLorentzVector &candidateMomentum = candidate->Momentum;
Note: See TracChangeset for help on using the changeset viewer.