Fork me on GitHub

Changeset 547 in svn for trunk


Ignore:
Timestamp:
Feb 22, 2010, 11:35:46 AM (15 years ago)
Author:
severine ovyn
Message:

bug fix(jet Ntracks), 3-prong taus, vertex coordinates for tracks

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r545 r547  
    11* Changes relative to V.1.8
     2   - update: default jet algorithms have change in data cards
     3   - update: adding some missing "#include" statements due to a loss of
     4     permissivity in recent g++ compilers.
     5   - update: by default, both 1-prong and 3-prong tau jets are stored.
     6     It was only 1-prong before.
     7   - bug fix: bad distribution in associated number of tracks in jets
     8   - vertex coordinates available in the track collection (Vx, Vy, Vz)
    29   - track reconstruction efficiencies can now be floating numbers
    310   - minor addition in the $(SHARED) target rule of the Makefile

  • trunk/Delphes.cpp

    r536 r547  
    6363#include <vector>
    6464#include <iostream>
     65#include <cstdlib> // abs(int)
    6566
    6667using namespace std;
    … …  
    504505                      elementTrack = (TRootTracks*) branchTrack->NewEntry();
    505506                      elementTrack->Set(particle->Eta, particle->Phi, particle->EtaCalo, particle->PhiCalo, sET, particle->Charge);
     507                      elementTrack->Vx=particle->X;
     508                      elementTrack->Vy=particle->Y;
     509                      elementTrack->Vz=particle->Z;
    506510                      TrackCentral.push_back(*elementTrack); // tracks at vertex!
    507511                      if(DET->JET_Eflow)

  • trunk/FAQ

    r348 r547  
    3535        trigger_card - Datacard containing the trigger algorithms (optional)
    3636        me@mylaptop:~$ ./Trigger_Only test_without_trigger.root test_with_trigger.root data/mydetector.dat data/mytrigger.dat
     37
     38(Q) From v1.9, Delphes allows both 1-prong and 3-prong tau-jets. How can I restrict the collection to 1-prong taus?
     39(A) Check the values of the number of tracks associated to the jets (Ntracks) in the tau collection
    3740
    3841(Q) I do not remember how to run FROG

  • trunk/Makefile

    r533 r547  
    4545
    4646
     47Resolutions$(ExeSuf): \
     48        tmp/Resolutions.$(ObjSuf)
     49
     50tmp/Resolutions.$(ObjSuf): \
     51        Resolutions.cpp
    4752Resolutions_ATLAS$(ExeSuf): \
    4853        tmp/Resolutions_ATLAS.$(ObjSuf)
    … …  
    5560tmp/Delphes.$(ObjSuf): \
    5661        Delphes.cpp
    57 Resolutions$(ExeSuf): \
    58         tmp/Resolutions.$(ObjSuf)
    59 
    60 tmp/Resolutions.$(ObjSuf): \
    61         Resolutions.cpp
     62Frog_on_analysis_output$(ExeSuf): \
     63        tmp/Examples/Frog_on_analysis_output.$(ObjSuf)
     64
     65tmp/Examples/Frog_on_analysis_output.$(ObjSuf): \
     66        Examples/Frog_on_analysis_output.cpp
     67LHCO_Only$(ExeSuf): \
     68        tmp/Examples/LHCO_Only.$(ObjSuf)
     69
     70tmp/Examples/LHCO_Only.$(ObjSuf): \
     71        Examples/LHCO_Only.cpp
    6272Convertors_Only$(ExeSuf): \
    6373        tmp/Examples/Convertors_Only.$(ObjSuf)
    … …  
    6575tmp/Examples/Convertors_Only.$(ObjSuf): \
    6676        Examples/Convertors_Only.cpp
     77Trigger_Only$(ExeSuf): \
     78        tmp/Examples/Trigger_Only.$(ObjSuf)
     79
     80tmp/Examples/Trigger_Only.$(ObjSuf): \
     81        Examples/Trigger_Only.cpp
    6782Analysis_Ex$(ExeSuf): \
    6883        tmp/Examples/Analysis_Ex.$(ObjSuf)
    … …  
    7186        Examples/Analysis_Ex.cpp \
    7287        Examples/interface/Analysis_Ex.h
    73 Trigger_Only$(ExeSuf): \
    74         tmp/Examples/Trigger_Only.$(ObjSuf)
    75 
    76 tmp/Examples/Trigger_Only.$(ObjSuf): \
    77         Examples/Trigger_Only.cpp
    78 LHCO_Only$(ExeSuf): \
    79         tmp/Examples/LHCO_Only.$(ObjSuf)
    80 
    81 tmp/Examples/LHCO_Only.$(ObjSuf): \
    82         Examples/LHCO_Only.cpp
    83 Frog_on_analysis_output$(ExeSuf): \
    84         tmp/Examples/Frog_on_analysis_output.$(ObjSuf)
    85 
    86 tmp/Examples/Frog_on_analysis_output.$(ObjSuf): \
    87         Examples/Frog_on_analysis_output.cpp
    8888EXECUTABLE =  \
     89        Resolutions$(ExeSuf) \
    8990        Resolutions_ATLAS$(ExeSuf) \
    9091        Delphes$(ExeSuf) \
    91         Resolutions$(ExeSuf) \
     92        Frog_on_analysis_output$(ExeSuf) \
     93        LHCO_Only$(ExeSuf) \
    9294        Convertors_Only$(ExeSuf) \
    93         Analysis_Ex$(ExeSuf) \
    9495        Trigger_Only$(ExeSuf) \
    95         LHCO_Only$(ExeSuf) \
    96         Frog_on_analysis_output$(ExeSuf)
     96        Analysis_Ex$(ExeSuf)
    9797
    9898EXECUTABLE_OBJ =  \
     99        tmp/Resolutions.$(ObjSuf) \
    99100        tmp/Resolutions_ATLAS.$(ObjSuf) \
    100101        tmp/Delphes.$(ObjSuf) \
    101         tmp/Resolutions.$(ObjSuf) \
     102        tmp/Examples/Frog_on_analysis_output.$(ObjSuf) \
     103        tmp/Examples/LHCO_Only.$(ObjSuf) \
    102104        tmp/Examples/Convertors_Only.$(ObjSuf) \
    103         tmp/Examples/Analysis_Ex.$(ObjSuf) \
    104105        tmp/Examples/Trigger_Only.$(ObjSuf) \
    105         tmp/Examples/LHCO_Only.$(ObjSuf) \
    106         tmp/Examples/Frog_on_analysis_output.$(ObjSuf)
     106        tmp/Examples/Analysis_Ex.$(ObjSuf)
    107107
    108108tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf): \
    … …  
    126126        tmp/Examples/src/Analysis_ExDict.$(ObjSuf)
    127127
     128tmp/src/LHCOConverter.$(ObjSuf): \
     129        src/LHCOConverter.$(SrcSuf)
     130tmp/src/VeryForward.$(ObjSuf): \
     131        src/VeryForward.$(SrcSuf)
     132tmp/src/TriggerUtil.$(ObjSuf): \
     133        src/TriggerUtil.$(SrcSuf)
     134tmp/src/STDHEPConverter.$(ObjSuf): \
     135        src/STDHEPConverter.$(SrcSuf)
     136tmp/src/TreeClasses.$(ObjSuf): \
     137        src/TreeClasses.$(SrcSuf)
     138tmp/src/PdgParticle.$(ObjSuf): \
     139        src/PdgParticle.$(SrcSuf)
    128140tmp/src/JetsUtil.$(ObjSuf): \
    129141        src/JetsUtil.$(SrcSuf)
     142tmp/src/FrogUtil.$(ObjSuf): \
     143        src/FrogUtil.$(SrcSuf)
     144tmp/src/HepMCConverter.$(ObjSuf): \
     145        src/HepMCConverter.$(SrcSuf)
     146tmp/src/DelphesRootConverter.$(ObjSuf): \
     147        src/DelphesRootConverter.$(SrcSuf)
     148tmp/src/LHEFConverter.$(ObjSuf): \
     149        src/LHEFConverter.$(SrcSuf)
     150tmp/src/BFieldProp.$(ObjSuf): \
     151        src/BFieldProp.$(SrcSuf)
     152tmp/src/HEPEVTConverter.$(ObjSuf): \
     153        src/HEPEVTConverter.$(SrcSuf)
    130154tmp/src/CaloUtil.$(ObjSuf): \
    131155        src/CaloUtil.$(SrcSuf)
     156tmp/src/D_Constants.$(ObjSuf): \
     157        src/D_Constants.$(SrcSuf)
    132158tmp/src/SmearUtil.$(ObjSuf): \
    133159        src/SmearUtil.$(SrcSuf)
    134 tmp/src/DelphesRootConverter.$(ObjSuf): \
    135         src/DelphesRootConverter.$(SrcSuf)
    136 tmp/src/PdgParticle.$(ObjSuf): \
    137         src/PdgParticle.$(SrcSuf)
    138 tmp/src/TriggerUtil.$(ObjSuf): \
    139         src/TriggerUtil.$(SrcSuf)
    140 tmp/src/BFieldProp.$(ObjSuf): \
    141         src/BFieldProp.$(SrcSuf)
    142 tmp/src/VeryForward.$(ObjSuf): \
    143         src/VeryForward.$(SrcSuf)
    144 tmp/src/LHEFConverter.$(ObjSuf): \
    145         src/LHEFConverter.$(SrcSuf)
    146 tmp/src/HepMCConverter.$(ObjSuf): \
    147         src/HepMCConverter.$(SrcSuf)
    148 tmp/src/FrogUtil.$(ObjSuf): \
    149         src/FrogUtil.$(SrcSuf)
    150 tmp/src/STDHEPConverter.$(ObjSuf): \
    151         src/STDHEPConverter.$(SrcSuf)
    152 tmp/src/HEPEVTConverter.$(ObjSuf): \
    153         src/HEPEVTConverter.$(SrcSuf)
    154 tmp/src/D_Constants.$(ObjSuf): \
    155         src/D_Constants.$(SrcSuf)
    156 tmp/src/TreeClasses.$(ObjSuf): \
    157         src/TreeClasses.$(SrcSuf)
    158 tmp/src/LHCOConverter.$(ObjSuf): \
    159         src/LHCOConverter.$(SrcSuf)
    160 tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf): \
    161         Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf)
    162 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \
    163         Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf)
    164 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \
    165         Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf)
    166160tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf): \
    167161        Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(SrcSuf)
    168162tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \
    169163        Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf)
     164tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \
     165        Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf)
     166tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf): \
     167        Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf)
     168tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \
     169        Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf)
     170tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
     171        Utilities/Hector/src/H_Parameters.$(SrcSuf)
     172tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
     173        Utilities/Hector/src/H_RomanPot.$(SrcSuf)
     174tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
     175        Utilities/Hector/src/H_Beam.$(SrcSuf)
     176tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
     177        Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
     178tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \
     179        Utilities/Hector/src/H_RecRPObject.$(SrcSuf)
     180tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \
     181        Utilities/Hector/src/H_Drift.$(SrcSuf)
     182tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \
     183        Utilities/Hector/src/H_CircularAperture.$(SrcSuf)
     184tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
     185        Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
     186tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
     187        Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
     188tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
     189        Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
     190tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \
     191        Utilities/Hector/src/H_OpticalElement.$(SrcSuf)
    170192tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \
    171193        Utilities/Hector/src/H_Kicker.$(SrcSuf)
     194tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
     195        Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
     196tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \
     197        Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf)
     198tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \
     199        Utilities/Hector/src/H_Aperture.$(SrcSuf)
     200tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \
     201        Utilities/Hector/src/H_BeamParticle.$(SrcSuf)
     202tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \
     203        Utilities/Hector/src/H_TransportMatrices.$(SrcSuf)
     204tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \
     205        Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf)
     206tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \
     207        Utilities/Hector/src/H_Quadrupole.$(SrcSuf)
     208tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
     209        Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
     210tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \
     211        Utilities/Hector/src/H_Marker.$(SrcSuf)
     212tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
     213        Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
     214tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
     215        Utilities/Hector/src/H_BeamLine.$(SrcSuf)
    172216tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \
    173217        Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf)
    174 tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
    175         Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
    176 tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
    177         Utilities/Hector/src/H_RomanPot.$(SrcSuf)
    178 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \
    179         Utilities/Hector/src/H_CircularAperture.$(SrcSuf)
    180 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \
    181         Utilities/Hector/src/H_TransportMatrices.$(SrcSuf)
     218tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \
     219        Utilities/Hector/src/H_VerticalKicker.$(SrcSuf)
     220tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \
     221        Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf)
    182222tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \
    183223        Utilities/Hector/src/H_Dipole.$(SrcSuf)
    184 tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \
    185         Utilities/Hector/src/H_Drift.$(SrcSuf)
    186 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \
    187         Utilities/Hector/src/H_Aperture.$(SrcSuf)
    188 tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \
    189         Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf)
    190 tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
    191         Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
    192 tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
    193         Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
    194 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \
    195         Utilities/Hector/src/H_VerticalKicker.$(SrcSuf)
    196 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
    197         Utilities/Hector/src/H_Parameters.$(SrcSuf)
    198 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
    199         Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
    200 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
    201         Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
    202 tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
    203         Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
    204 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \
    205         Utilities/Hector/src/H_Marker.$(SrcSuf)
    206 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \
    207         Utilities/Hector/src/H_OpticalElement.$(SrcSuf)
    208 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \
    209         Utilities/Hector/src/H_Quadrupole.$(SrcSuf)
    210 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
    211         Utilities/Hector/src/H_BeamLine.$(SrcSuf)
    212 tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
    213         Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
    214 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \
    215         Utilities/Hector/src/H_BeamParticle.$(SrcSuf)
    216 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \
    217         Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf)
    218 tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \
    219         Utilities/Hector/src/H_RecRPObject.$(SrcSuf)
    220 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
    221         Utilities/Hector/src/H_Beam.$(SrcSuf)
    222 tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \
    223         Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf)
     224tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \
     225        Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf)
     226tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \
     227        Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)
     228tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \
     229        Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf)
     230tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \
     231        Utilities/Fastjet/src/MinHeap.$(SrcSuf)
     232tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \
     233        Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf)
     234tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \
     235        Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)
     236tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf): \
     237        Utilities/Fastjet/src/Voronoi.$(SrcSuf)
     238tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \
     239        Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)
     240tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf): \
     241        Utilities/Fastjet/src/RangeDefinition.$(SrcSuf)
     242tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \
     243        Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf)
     244tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \
     245        Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf)
    224246tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
    225247        Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf)
    226 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \
    227         Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)
    228 tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \
    229         Utilities/Fastjet/src/Error.$(SrcSuf)
     248tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \
     249        Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)
     250tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \
     251        Utilities/Fastjet/src/JetDefinition.$(SrcSuf)
     252tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \
     253        Utilities/Fastjet/src/BasicRandom.$(SrcSuf)
     254tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \
     255        Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf)
     256tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \
     257        Utilities/Fastjet/src/DnnPlane.$(SrcSuf)
    230258tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \
    231259        Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf)
    232 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \
    233         Utilities/Fastjet/src/DnnPlane.$(SrcSuf)
    234 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \
    235         Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)
    236 tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \
    237         Utilities/Fastjet/src/BasicRandom.$(SrcSuf)
    238 tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \
    239         Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf)
    240 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \
    241         Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf)
    242 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \
    243         Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf)
    244 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \
    245         Utilities/Fastjet/src/JetDefinition.$(SrcSuf)
    246 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \
    247         Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)
    248 tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \
    249         Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf)
    250 tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \
    251         Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf)
    252 tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \
    253         Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf)
    254 tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \
    255         Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf)
    256 tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \
    257         Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf)
    258 tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \
    259         Utilities/Fastjet/src/MinHeap.$(SrcSuf)
    260 tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \
    261         Utilities/Fastjet/src/PseudoJet.$(SrcSuf)
    262 tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \
    263         Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf)
    264 tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf): \
    265         Utilities/Fastjet/src/RangeDefinition.$(SrcSuf)
    266 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \
    267         Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)
    268260tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \
    269261        Utilities/Fastjet/src/ClusterSequence.$(SrcSuf)
    270262tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
    271263        Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf)
    272 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \
    273         Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)
    274 tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf): \
    275         Utilities/Fastjet/src/Voronoi.$(SrcSuf)
     264tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \
     265        Utilities/Fastjet/src/PseudoJet.$(SrcSuf)
     266tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \
     267        Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)
     268tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \
     269        Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf)
     270tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \
     271        Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf)
     272tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \
     273        Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf)
     274tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \
     275        Utilities/Fastjet/src/Error.$(SrcSuf)
    276276tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf): \
    277277        Utilities/Fastjet/src/Dnn2piCylinder.$(SrcSuf)
    … …  
    283283        Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
    284284        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     285tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
     286        Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)
     287tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \
     288        Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf)
    285289tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \
    286290        Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf)
    287 tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \
    288         Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf)
    289 tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \
    290         Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf)
    291 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
    292         Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)
    293 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \
    294         Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)
     291tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \
     292        Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf)
    295293tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \
    296294        Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(SrcSuf)
    297295tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf): \
    298296        Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(SrcSuf)
    299 tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \
    300         Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf)
     297tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \
     298        Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf)
     299tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \
     300        Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)
    301301tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
    302302        Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
    303303        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
    304 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \
    305         Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)
    306 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \
    307         Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)
    308 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \
    309         Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)
    310304tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf): \
    311305        Utilities/Fastjet/plugins/SISCone/src/ranlux.$(SrcSuf)
    312 tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \
    313         Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf)
    314 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \
    315         Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)
    316 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \
    317         Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)
    318 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \
    319         Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf)
    320 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \
    321         Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)
    322306tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf): \
    323307        Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(SrcSuf)
    324308tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf): \
    325309        Utilities/Fastjet/plugins/SISCone/src/momentum.$(SrcSuf)
     310tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \
     311        Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)
     312tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \
     313        Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)
     314tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \
     315        Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)
    326316tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf): \
    327317        Utilities/Fastjet/plugins/SISCone/src/quadtree.$(SrcSuf)
     318tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \
     319        Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)
     320tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \
     321        Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)
     322tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \
     323        Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf)
     324tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \
     325        Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf)
     326tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \
     327        Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)
    328328tmp/Examples/src/Analysis_Ex.$(ObjSuf): \
    329329        Examples/src/Analysis_Ex.$(SrcSuf) \
    330330        Examples/interface/Analysis_Ex.h
     331tmp/Utilities/HepMC/src/GenEvent.$(ObjSuf): \
     332        Utilities/HepMC/src/GenEvent.$(SrcSuf)
     333tmp/Utilities/HepMC/src/CommonIO.$(ObjSuf): \
     334        Utilities/HepMC/src/CommonIO.$(SrcSuf)
     335tmp/Utilities/HepMC/src/Units.$(ObjSuf): \
     336        Utilities/HepMC/src/Units.$(SrcSuf)
     337tmp/Utilities/HepMC/src/Flow.$(ObjSuf): \
     338        Utilities/HepMC/src/Flow.$(SrcSuf)
     339tmp/Utilities/HepMC/src/ParticleData.$(ObjSuf): \
     340        Utilities/HepMC/src/ParticleData.$(SrcSuf)
     341tmp/Utilities/HepMC/src/GenVertex.$(ObjSuf): \
     342        Utilities/HepMC/src/GenVertex.$(SrcSuf)
     343tmp/Utilities/HepMC/src/Polarization.$(ObjSuf): \
     344        Utilities/HepMC/src/Polarization.$(SrcSuf)
     345tmp/Utilities/HepMC/src/IO_Ascii.$(ObjSuf): \
     346        Utilities/HepMC/src/IO_Ascii.$(SrcSuf)
     347tmp/Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(ObjSuf): \
     348        Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(SrcSuf)
     349tmp/Utilities/HepMC/src/IO_GenEvent.$(ObjSuf): \
     350        Utilities/HepMC/src/IO_GenEvent.$(SrcSuf)
    331351tmp/Utilities/HepMC/src/SearchVector.$(ObjSuf): \
    332352        Utilities/HepMC/src/SearchVector.$(SrcSuf)
    333 tmp/Utilities/HepMC/src/Units.$(ObjSuf): \
    334         Utilities/HepMC/src/Units.$(SrcSuf)
    335 tmp/Utilities/HepMC/src/Polarization.$(ObjSuf): \
    336         Utilities/HepMC/src/Polarization.$(SrcSuf)
    337 tmp/Utilities/HepMC/src/ParticleData.$(ObjSuf): \
    338         Utilities/HepMC/src/ParticleData.$(SrcSuf)
    339 tmp/Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(ObjSuf): \
    340         Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(SrcSuf)
    341 tmp/Utilities/HepMC/src/Flow.$(ObjSuf): \
    342         Utilities/HepMC/src/Flow.$(SrcSuf)
    343 tmp/Utilities/HepMC/src/GenEvent.$(ObjSuf): \
    344         Utilities/HepMC/src/GenEvent.$(SrcSuf)
    345 tmp/Utilities/HepMC/src/IO_Ascii.$(ObjSuf): \
    346         Utilities/HepMC/src/IO_Ascii.$(SrcSuf)
     353tmp/Utilities/HepMC/src/IO_AsciiParticles.$(ObjSuf): \
     354        Utilities/HepMC/src/IO_AsciiParticles.$(SrcSuf)
     355tmp/Utilities/HepMC/src/CompareGenEvent.$(ObjSuf): \
     356        Utilities/HepMC/src/CompareGenEvent.$(SrcSuf)
    347357tmp/Utilities/HepMC/src/GenParticle.$(ObjSuf): \
    348358        Utilities/HepMC/src/GenParticle.$(SrcSuf)
    349 tmp/Utilities/HepMC/src/IO_GenEvent.$(ObjSuf): \
    350         Utilities/HepMC/src/IO_GenEvent.$(SrcSuf)
    351 tmp/Utilities/HepMC/src/GenVertex.$(ObjSuf): \
    352         Utilities/HepMC/src/GenVertex.$(SrcSuf)
    353 tmp/Utilities/HepMC/src/CompareGenEvent.$(ObjSuf): \
    354         Utilities/HepMC/src/CompareGenEvent.$(SrcSuf)
    355 tmp/Utilities/HepMC/src/IO_AsciiParticles.$(ObjSuf): \
    356         Utilities/HepMC/src/IO_AsciiParticles.$(SrcSuf)
    357 tmp/Utilities/HepMC/src/CommonIO.$(ObjSuf): \
    358         Utilities/HepMC/src/CommonIO.$(SrcSuf)
    359359SOURCE_OBJ =  \
     360        tmp/src/LHCOConverter.$(ObjSuf) \
     361        tmp/src/VeryForward.$(ObjSuf) \
     362        tmp/src/TriggerUtil.$(ObjSuf) \
     363        tmp/src/STDHEPConverter.$(ObjSuf) \
     364        tmp/src/TreeClasses.$(ObjSuf) \
     365        tmp/src/PdgParticle.$(ObjSuf) \
    360366        tmp/src/JetsUtil.$(ObjSuf) \
     367        tmp/src/FrogUtil.$(ObjSuf) \
     368        tmp/src/HepMCConverter.$(ObjSuf) \
     369        tmp/src/DelphesRootConverter.$(ObjSuf) \
     370        tmp/src/LHEFConverter.$(ObjSuf) \
     371        tmp/src/BFieldProp.$(ObjSuf) \
     372        tmp/src/HEPEVTConverter.$(ObjSuf) \
    361373        tmp/src/CaloUtil.$(ObjSuf) \
     374        tmp/src/D_Constants.$(ObjSuf) \
    362375        tmp/src/SmearUtil.$(ObjSuf) \
    363         tmp/src/DelphesRootConverter.$(ObjSuf) \
    364         tmp/src/PdgParticle.$(ObjSuf) \
    365         tmp/src/TriggerUtil.$(ObjSuf) \
    366         tmp/src/BFieldProp.$(ObjSuf) \
    367         tmp/src/VeryForward.$(ObjSuf) \
    368         tmp/src/LHEFConverter.$(ObjSuf) \
    369         tmp/src/HepMCConverter.$(ObjSuf) \
    370         tmp/src/FrogUtil.$(ObjSuf) \
    371         tmp/src/STDHEPConverter.$(ObjSuf) \
    372         tmp/src/HEPEVTConverter.$(ObjSuf) \
    373         tmp/src/D_Constants.$(ObjSuf) \
    374         tmp/src/TreeClasses.$(ObjSuf) \
    375         tmp/src/LHCOConverter.$(ObjSuf) \
    376         tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \
    377         tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \
    378         tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
    379376        tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \
    380377        tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf) \
     378        tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \
     379        tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \
     380        tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
     381        tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
     382        tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
     383        tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
     384        tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
     385        tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \
     386        tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \
     387        tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \
     388        tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
     389        tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
     390        tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
     391        tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \
    381392        tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \
     393        tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
     394        tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \
     395        tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \
     396        tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \
     397        tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \
     398        tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \
     399        tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \
     400        tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
     401        tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \
     402        tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
     403        tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
    382404        tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \
    383         tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
    384         tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
    385         tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \
    386         tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \
     405        tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \
     406        tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \
    387407        tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \
    388         tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \
    389         tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \
    390         tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \
    391         tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
    392         tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
    393         tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \
    394         tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
    395         tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
    396         tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
    397         tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
    398         tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \
    399         tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \
    400         tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \
    401         tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
    402         tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
    403         tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \
    404         tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \
    405         tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \
    406         tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
    407         tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \
     408        tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \
     409        tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \
     410        tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \
     411        tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \
     412        tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \
     413        tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \
     414        tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf) \
     415        tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \
     416        tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf) \
     417        tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \
     418        tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \
    408419        tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
    409         tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \
    410         tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \
     420        tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \
     421        tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \
     422        tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \
     423        tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \
     424        tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \
    411425        tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \
    412         tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \
    413         tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \
    414         tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \
    415         tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \
    416         tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \
    417         tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \
    418         tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \
    419         tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \
    420         tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \
    421         tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \
    422         tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \
    423         tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \
    424         tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \
    425         tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \
    426         tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \
    427         tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \
    428         tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf) \
    429         tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \
    430426        tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \
    431427        tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
    432         tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \
    433         tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf) \
     428        tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \
     429        tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \
     430        tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \
     431        tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \
     432        tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \
     433        tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \
    434434        tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf) \
    435435        tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
    436436        tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
     437        tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
     438        tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \
    437439        tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \
    438         tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \
    439         tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \
    440         tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
    441         tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \
     440        tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \
    442441        tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf) \
    443442        tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf) \
    444         tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \
     443        tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \
     444        tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \
    445445        tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
    446         tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \
    447         tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \
    448         tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \
    449446        tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf) \
    450         tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf) \
    451         tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \
    452         tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \
    453         tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \
    454         tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \
    455447        tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf) \
    456448        tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf) \
     449        tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \
     450        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \
     451        tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \
    457452        tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf) \
     453        tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \
     454        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \
     455        tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \
     456        tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf) \
     457        tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \
    458458        tmp/Examples/src/Analysis_Ex.$(ObjSuf) \
     459        tmp/Utilities/HepMC/src/GenEvent.$(ObjSuf) \
     460        tmp/Utilities/HepMC/src/CommonIO.$(ObjSuf) \
     461        tmp/Utilities/HepMC/src/Units.$(ObjSuf) \
     462        tmp/Utilities/HepMC/src/Flow.$(ObjSuf) \
     463        tmp/Utilities/HepMC/src/ParticleData.$(ObjSuf) \
     464        tmp/Utilities/HepMC/src/GenVertex.$(ObjSuf) \
     465        tmp/Utilities/HepMC/src/Polarization.$(ObjSuf) \
     466        tmp/Utilities/HepMC/src/IO_Ascii.$(ObjSuf) \
     467        tmp/Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(ObjSuf) \
     468        tmp/Utilities/HepMC/src/IO_GenEvent.$(ObjSuf) \
    459469        tmp/Utilities/HepMC/src/SearchVector.$(ObjSuf) \
    460         tmp/Utilities/HepMC/src/Units.$(ObjSuf) \
    461         tmp/Utilities/HepMC/src/Polarization.$(ObjSuf) \
    462         tmp/Utilities/HepMC/src/ParticleData.$(ObjSuf) \
    463         tmp/Utilities/HepMC/src/IO_PDG_ParticleDataTable.$(ObjSuf) \
    464         tmp/Utilities/HepMC/src/Flow.$(ObjSuf) \
    465         tmp/Utilities/HepMC/src/GenEvent.$(ObjSuf) \
    466         tmp/Utilities/HepMC/src/IO_Ascii.$(ObjSuf) \
    467         tmp/Utilities/HepMC/src/GenParticle.$(ObjSuf) \
    468         tmp/Utilities/HepMC/src/IO_GenEvent.$(ObjSuf) \
    469         tmp/Utilities/HepMC/src/GenVertex.$(ObjSuf) \
     470        tmp/Utilities/HepMC/src/IO_AsciiParticles.$(ObjSuf) \
    470471        tmp/Utilities/HepMC/src/CompareGenEvent.$(ObjSuf) \
    471         tmp/Utilities/HepMC/src/IO_AsciiParticles.$(ObjSuf) \
    472         tmp/Utilities/HepMC/src/CommonIO.$(ObjSuf)
    473 
    474 tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \
    475         Utilities/mcfio/mcfio_UserDictionary.c
    476 tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \
    477         Utilities/mcfio/mcfio_Util1.c
     472        tmp/Utilities/HepMC/src/GenParticle.$(ObjSuf)
     473
    478474tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \
    479475        Utilities/mcfio/mcf_ntuBldDbinc.c
    480476tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \
    481477        Utilities/mcfio/mcfio_SeqDummy.c
     478tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \
     479        Utilities/mcfio/mcfio_Util1.c
     480tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
     481        Utilities/mcfio/mcf_evt_xdr.c
     482tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
     483        Utilities/mcfio/mcf_NTuIOUtils.c
    482484tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \
    483485        Utilities/mcfio/mcfio_Block.c
    484 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
    485         Utilities/mcfio/mcf_evt_xdr.c
    486486tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf): \
    487487        Utilities/mcfio/mcfio_Direct.c
     488tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
     489        Utilities/mcfio/mcf_NTuIOFiles.c
     490tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \
     491        Utilities/mcfio/mcfio_UserDictionary.c
    488492tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \
    489493        Utilities/mcfio/mcf_ntubldInit.c
    490 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
    491         Utilities/mcfio/mcf_NTuIOUtils.c
    492 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
    493         Utilities/mcfio/mcf_NTuIOFiles.c
     494tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
     495        Utilities/stdhep/mcf_hepev4_xdr.c \
     496        Utilities/mcfio/mcfio_Dict.h \
     497        Utilities/mcfio/mcf_xdr.h \
     498        Utilities/stdhep/stdhep.h \
     499        Utilities/stdhep/hepev4.h \
     500        Utilities/stdhep/stdtmp.h \
     501        Utilities/stdhep/stdver.h
     502tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
     503        Utilities/stdhep/mcf_stdcm1_xdr.c \
     504        Utilities/mcfio/mcfio_Dict.h \
     505        Utilities/mcfio/mcf_xdr.h \
     506        Utilities/stdhep/stdcm1.h \
     507        Utilities/stdhep/stdver.h
    494508tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \
    495509        Utilities/stdhep/mcf_hepup_xdr.c \
    … …  
    499513        Utilities/stdhep/heprup.h \
    500514        Utilities/stdhep/stdver.h
     515tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
     516        Utilities/stdhep/mcf_Stdhep_xdr.c \
     517        Utilities/mcfio/mcfio_Dict.h \
     518        Utilities/mcfio/mcf_xdr.h \
     519        Utilities/stdhep/stdhep.h \
     520        Utilities/stdhep/stdtmp.h \
     521        Utilities/stdhep/stdver.h
     522tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
     523        Utilities/stdhep/stdhep_internal_utils.c \
     524        Utilities/stdhep/stdhep.h \
     525        Utilities/stdhep/hepev4.h \
     526        Utilities/stdhep/stdtmp.h \
     527        Utilities/stdhep/hepeup.h
    501528tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf): \
    502529        Utilities/stdhep/stdhep_mcfio.c \
    … …  
    514541        Utilities/stdhep/stdcnt.h \
    515542        Utilities/stdhep/stdhep_mcfio.h
    516 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
    517         Utilities/stdhep/mcf_hepev4_xdr.c \
    518         Utilities/mcfio/mcfio_Dict.h \
    519         Utilities/mcfio/mcf_xdr.h \
    520         Utilities/stdhep/stdhep.h \
    521         Utilities/stdhep/hepev4.h \
    522         Utilities/stdhep/stdtmp.h \
    523         Utilities/stdhep/stdver.h
    524 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
    525         Utilities/stdhep/mcf_Stdhep_xdr.c \
    526         Utilities/mcfio/mcfio_Dict.h \
    527         Utilities/mcfio/mcf_xdr.h \
    528         Utilities/stdhep/stdhep.h \
    529         Utilities/stdhep/stdtmp.h \
    530         Utilities/stdhep/stdver.h
    531 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
    532         Utilities/stdhep/mcf_stdcm1_xdr.c \
    533         Utilities/mcfio/mcfio_Dict.h \
    534         Utilities/mcfio/mcf_xdr.h \
    535         Utilities/stdhep/stdcm1.h \
    536         Utilities/stdhep/stdver.h
    537 tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
    538         Utilities/stdhep/stdhep_internal_utils.c \
    539         Utilities/stdhep/stdhep.h \
    540         Utilities/stdhep/hepev4.h \
    541         Utilities/stdhep/stdtmp.h \
    542         Utilities/stdhep/hepeup.h
    543543STDHEP_OBJ =  \
    544         tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \
    545         tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \
    546544        tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \
    547545        tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \
     546        tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \
     547        tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
     548        tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
    548549        tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \
    549         tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
    550550        tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf) \
     551        tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
     552        tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \
    551553        tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \
    552         tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
    553         tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
     554        tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \
     555        tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf) \
    554556        tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \
    555         tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf) \
    556         tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \
    557557        tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) \
    558         tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf) \
    559         tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf)
     558        tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf) \
     559        tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf)
    560560
    561561Examples/interface/Analysis_Ex.h: \

  • trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

    r450 r547  
    321321    float PT, E, Px, Py, Pz;  // transverse momentum
    322322    float Charge;
     323    float Vx,Vy,Vz;
    323324 ClassDef(TRootTracks, 1)
    324325};

  • trunk/Utilities/FROG/Includes/FROG/FROG_Path.cpp

    r253 r547  
    11#include "FROG_Path.h"
    22#include <string.h>
     3#include <cstdio>
    34
    45namespace FROG_PATH{

  • trunk/Utilities/Fastjet/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh

    r11 r547  
    3838#include<iostream>
    3939#include<vector>
     40#include<cstdio>
    4041
    4142FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh

  • trunk/Utilities/Hector/src/H_BeamLine.cc

    r281 r547  
    2424#include <fstream>
    2525#include <sstream>
     26#include <cstdlib>
    2627
    2728// local #includes

  • trunk/data/DetectorCard.dat

    r494 r547  
    8686# General jet variable
    8787JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
    88 JET_jetalgo      1              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
     88JET_jetalgo      4              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    9090JET_Eflow        0              // Perfect energy assumed in the tracker coverage
    … …  
    136136NEvents_Frog      100
    137137# Number of events to process
    138 NEvents           -1                    // -1 means 'all'
     138NEvents           100                    // -1 means 'all'
    139139
    140140# input PDG tables

  • trunk/data/DetectorCard_ATLAS.dat

    r494 r547  
    8686# General jet variable
    8787JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
    88 JET_jetalgo      1              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
     88JET_jetalgo      6              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    90 JET_Eflow        0              // Perfect energy assumed in the tracker coverage
     90JET_Eflow        1              // Perfect energy assumed in the tracker coverage
    9191
    9292# Tagging definition

  • trunk/data/DetectorCard_CMS.dat

    r494 r547  
    8686# General jet variable
    8787JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
    88 JET_jetalgo      4              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
     88JET_jetalgo      6              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    90 JET_Eflow        0              // Perfect energy assumed in the tracker coverage
     90JET_Eflow        1              // Perfect energy assumed in the tracker coverage
    9191
    9292# Tagging definition

  • trunk/src/JetsUtil.cc

    r443 r547  
    165165            for (unsigned int j = 0; j < constituents.size(); j++)
    166166                {
    167                   D_CaloTower calConsti(list_of_active_towers.getElement(constituents[j].eta(),constituents[j].phi()));
     167                  //D_CaloTower calConsti(list_of_active_towers.getElement(constituents[j].eta(),constituents[j].phi()));
     168                  // bug fix! bad association of phi [-pi;pi] <-> [0 ; 2pi]
     169                  D_CaloTower calConsti(list_of_active_towers.getElement(constituents[j].eta(),constituents[j].phi_std()));
    168170                  EmVal  += calConsti.getEem();
    169171                  HadVal += calConsti.getEhad();
    … …  
    224226  for (unsigned int i = 0; i < sorted_jets.size(); i++) {
    225227    JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E());
    226     // Tau jet identification : 1! track and electromagnetic collimation
     228    // Tau jet identification : 1! or 3! track and electromagnetic collimation
    227229    if(fabs(JET.Eta()) < (DET->CEN_max_tracker - DET->TAU_track_scone)) {
    228230      double Energie_tau_central = DET->EnergySmallCone(towers,JET.Eta(),JET.Phi());
     231      int NumTrackTau = DET->NumTracks(charge,TrackCentral,DET->TAU_track_pt,JET.Eta(),JET.Phi());
    229232      if(
    230233         ( Energie_tau_central/JET.E() > DET->TAU_energy_frac ) &&
    231          ( DET->NumTracks(charge,TrackCentral,DET->TAU_track_pt,JET.Eta(),JET.Phi()) == 1 ) &&
     234         (( NumTrackTau == 1 ) || ( NumTrackTau == 3 )) &&
    232235         ( JET.Pt() > DET->PTCUT_taujet)
    233236         ) {
Note: See TracChangeset for help on using the changeset viewer.