Fork me on GitHub

Changeset 11 in svn


Ignore:
Timestamp:
Nov 6, 2008, 3:32:15 PM (16 years ago)
Author:
severine ovyn
Message:

Fastjet added; CDFCones directory has been changed

Location:
trunk
Files:
127 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Delphes.cpp

    r2 r11  
    1919#include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    2020
    21 #include "Utilities/CDFCones/interface/JetCluAlgorithm.h"
    22 #include "Utilities/CDFCones/interface/MidPointAlgorithm.h"
    23 #include "Utilities/CDFCones/interface/PhysicsTower.h"
    24 #include "Utilities/CDFCones/interface/Cluster.h"
    25 
    2621#include "H_BeamParticle.h"
    2722#include "H_BeamLine.h"
    … …  
    3429
    3530#include "interface/SmearUtil.h"
     31#include "Utilities/Fastjet/include/fastjet/PseudoJet.hh"
     32#include "Utilities/Fastjet/include/fastjet/ClusterSequence.hh"
     33
     34// get info on how fastjet was configured
     35#include "Utilities/Fastjet/include/fastjet/config.h"
     36
     37// make sure we have what is needed
     38#ifdef ENABLE_PLUGIN_SISCONE
     39#  include "Utilities/Fastjet/plugins/SISCone/SISConePlugin.hh"
     40#endif
     41#ifdef ENABLE_PLUGIN_CDFCONES
     42#  include "Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.hh"
     43#  include "Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.hh"
     44#endif
     45
     46#include<vector>
     47#include<iostream>
     48
     49
    3650
    3751using namespace std;
    … …  
    154168  vector<TLorentzVector> TrackCentral; 
    155169  vector<PhysicsTower> towers;
    156   vector<Cluster> jets;
    157 
     170
     171  vector<fastjet::PseudoJet> input_particles;//for FastJet algorithm
     172  vector<fastjet::PseudoJet> inclusive_jets;
     173  vector<fastjet::PseudoJet> sorted_jets;
     174 
    158175  //Initialisation of Hector
    159176  extern bool relative_energy;
    … …  
    161178  extern int kickers_on;
    162179  kickers_on = 1;         // should always be 1
    163 
    164         // user should provide : (1) optics file for each beamline, and IPname,
    165           // and offset data (s,x) for optical elements
     180 
     181  // user should provide : (1) optics file for each beamline, and IPname,
     182  // and offset data (s,x) for optical elements
    166183  H_BeamLine* beamline1 = new H_BeamLine(1,500.);
    167184  beamline1->fill("data/LHCB1IR5_v6.500.tfs",1,"IP5");
    … …  
    171188  beamline1->add(rp220_1);
    172189  beamline1->add(rp420_1);
    173 
     190 
    174191  H_BeamLine* beamline2 = new H_BeamLine(1,500.);
    175192  beamline2->fill("data/LHCB1IR5_v6.500.tfs",-1,"IP5");
    … …  
    197214      TrackCentral.clear();
    198215      towers.clear();
     216      input_particles.clear();
    199217      TSimpleArray<TRootGenParticle> NFCentralQ;
    200218
    … …  
    266284                      break;
    267285                } // switch (pid)
    268 
     286               
    269287                // all final particles but muons and neutrinos 
    270288                // for calorimetric towers and mission PT
    271289                if(genMomentum.E()!=0) {
    272                         PTmis = PTmis + genMomentum;//ptmis
    273                         if(pid !=pMU) {
    274                               towers.push_back(PhysicsTower(LorentzVector(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())));
    275                               elementCalo = (TRootCalo*) branchCalo->NewEntry();
    276                               elementCalo->Set(genMomentum);
    277                         }
     290                  PTmis = PTmis + genMomentum;//ptmis
     291                  if(pid !=pMU) {
     292                    towers.push_back(PhysicsTower(LorentzVector(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())));
     293                    // create a fastjet::PseudoJet with these components and put it onto
     294                    // back of the input_particles vector
     295                    input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E()));
     296                    elementCalo = (TRootCalo*) branchCalo->NewEntry();
     297                    elementCalo->Set(genMomentum);
     298                  }
    278299                }
    279 
    280 
     300               
     301               
    281302                // all final charged particles
    282303                if(
    283                      ((rand()%100) < DET->TRACKING_EFF)  &&
    284                      (genMomentum.E()!=0) &&
    285                      (fabs(particle->Eta) < DET->MAX_TRACKER) &&
    286                      (genMomentum.Pt() > DET->PT_TRACKS_MIN ) &&     // pt too small to be taken into account
    287                      (pid != pGAMMA)    &&
    288                      (pid != pPI0)      &&
    289                      (pid != pK0L)      &&
    290                      (pid != pN)        &&
    291                      (pid != pSIGMA0)   &&
    292                      (pid != pDELTA0)   &&
    293                      (pid != pK0S)   // not charged particles : invisible by tracker
    294                  )
    295                     {
    296                       elementTracks = (TRootTracks*) branchTracks->NewEntry();
    297                       elementTracks->Set(genMomentum);
    298                       TrackCentral.push_back(genMomentum);
    299                     }
    300             } // switch
    301 
     304                   ((rand()%100) < DET->TRACKING_EFF)  &&
     305                   (genMomentum.E()!=0) &&
     306                   (fabs(particle->Eta) < DET->MAX_TRACKER) &&
     307                   (genMomentum.Pt() > DET->PT_TRACKS_MIN ) &&     // pt too small to be taken into account
     308                   (pid != pGAMMA)    &&
     309                   (pid != pPI0)      &&
     310                   (pid != pK0L)      &&
     311                   (pid != pN)        &&
     312                   (pid != pSIGMA0)   &&
     313                   (pid != pDELTA0)   &&
     314                   (pid != pK0S)   // not charged particles : invisible by tracker
     315                   )
     316                  {
     317                    elementTracks = (TRootTracks*) branchTracks->NewEntry();
     318                    elementTracks->Set(genMomentum);
     319                    TrackCentral.push_back(genMomentum);
     320                  }
     321          } // switch
     322         
    302323          // Forward particles in CASTOR ?
    303 /*        if (particle->Status == 1 && (fabs(particle->Eta) > DET->MIN_CALO_VFWD)
    304                                     && (fabs(particle->Eta) < DET->MAX_CALO_VFWD)) {
    305                
    306 
    307           } // CASTOR
    308 */
     324          /*      if (particle->Status == 1 && (fabs(particle->Eta) > DET->MIN_CALO_VFWD)
     325                  && (fabs(particle->Eta) < DET->MAX_CALO_VFWD)) {
     326                 
     327                 
     328                  } // CASTOR
     329          */
    309330          // Zero degree calorimeter, for forward neutrons and photons
    310331          if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > DET->MIN_ZDC ) {
    311 // !!!!!!!!! vérifier que particle->Z est bien en micromÚtres!!!
    312 // !!!!!!!!! vérifier que particle->T est bien en secondes!!!
    313 // !!!!!!!!! pas de smearing ! on garde trop d'info !
    314                 elementZdc = (TRootZdcHits*) branchZDC->NewEntry();
    315                 elementZdc->Set(genMomentum);
    316 
    317                 // time of flight t is t = T + d/[ cos(theta) v ]
    318                 //double tx = acos(particle->Px/particle->Pz);
    319                 //double ty = acos(particle->Py/particle->Pz);
    320                 //double theta = (1E-6)*sqrt( pow(tx,2) + pow(ty,2) );
    321                 //double flight_distance = (DET->ZDC_S - particle->Z*(1E-6))/cos(theta) ; // assumes that Z is in micrometers
    322                 double flight_distance = (DET->ZDC_S - particle->Z*(1E-6));
    323                         // assumes also that the emission angle is so small that 1/(cos theta) = 1
    324                 elementZdc->T = 0*particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles
    325                 elementZdc->side = sign(particle->Eta);
    326 
     332            // !!!!!!!!! vérifier que particle->Z est bien en micromÚtres!!!
     333            // !!!!!!!!! vérifier que particle->T est bien en secondes!!!
     334            // !!!!!!!!! pas de smearing ! on garde trop d'info !
     335            elementZdc = (TRootZdcHits*) branchZDC->NewEntry();
     336            elementZdc->Set(genMomentum);
     337           
     338            // time of flight t is t = T + d/[ cos(theta) v ]
     339            //double tx = acos(particle->Px/particle->Pz);
     340            //double ty = acos(particle->Py/particle->Pz);
     341            //double theta = (1E-6)*sqrt( pow(tx,2) + pow(ty,2) );
     342            //double flight_distance = (DET->ZDC_S - particle->Z*(1E-6))/cos(theta) ; // assumes that Z is in micrometers
     343            double flight_distance = (DET->ZDC_S - particle->Z*(1E-6));
     344            // assumes also that the emission angle is so small that 1/(cos theta) = 1
     345            elementZdc->T = 0*particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles
     346            elementZdc->side = sign(particle->Eta);
     347           
    327348          }
    328 
     349         
    329350          // if forward proton
    330351          if( (pid == pP)  && (particle->Status == 1) &&  (fabs(particle->Eta) > DET->MAX_CALO_FWD) )
    331352            {
    332 // !!!!!!!! put here particle->CHARGE and particle->MASS
    333                 H_BeamParticle p1; /// put here particle->CHARGE and particle->MASS
    334                 p1.smearAng();
    335                 p1.smearPos();
    336                 p1.setPosition(p1.getX()-500.,p1.getY(),p1.getTX()-1*kickers_on*CRANG,p1.getTY(),0);
    337                 p1.set4Momentum(particle->Px,particle->Py,particle->Pz,particle->E);
    338 
    339                 H_BeamLine *beamline;
    340                 if(particle->Eta >0) beamline = beamline1;
    341                 else beamline = beamline2;
    342 
    343                 p1.computePath(beamline,1);
    344 
    345                 if(p1.stopped(beamline)) {
    346                     if (p1.getStoppingElement()->getName()=="rp220_1" || p1.getStoppingElement()->getName()=="rp220_2") {
    347                         p1.propagate(DET->RP220_S);
    348                         elementRP220 = (TRootRomanPotHits*) branchRP220->NewEntry();
    349                         elementRP220->X  = (1E-6)*p1.getX();  // [m]
    350                         elementRP220->Y  = (1E-6)*p1.getY();  // [m]
    351                         elementRP220->Tx = (1E-6)*p1.getTX(); // [rad]
    352                         elementRP220->Ty = (1E-6)*p1.getTY(); // [rad]
    353                         elementRP220->S = p1.getS();          // [m]
    354                         elementRP220->T = -1;           // not yet implemented
    355                         elementRP220->E = p1.getE();    // not yet implemented
    356                         elementRP220->q2 = -1;          // not yet implemented
    357                         elementRP220->side = sign(particle->Eta);
    358 
    359                     } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") {
    360                         p1.propagate(DET->FP420_S);
    361                         elementFP420 = (TRootRomanPotHits*) branchFP420->NewEntry();
    362                         elementFP420->X  = (1E-6)*p1.getX();  // [m]
    363                         elementFP420->Y  = (1E-6)*p1.getY();  // [m]
    364                         elementFP420->Tx = (1E-6)*p1.getTX(); // [rad]
    365                         elementFP420->Ty = (1E-6)*p1.getTY(); // [rad]
    366                         elementFP420->S = p1.getS();          // [m]
    367                         elementFP420->T = -1;                 // not yet implemented
    368                         elementFP420->E = p1.getE();          // not yet implemented
    369                         elementFP420->q2 = -1;                // not yet implemented
    370                         elementFP420->side = sign(particle->Eta);
    371                     }
     353              // !!!!!!!! put here particle->CHARGE and particle->MASS
     354              H_BeamParticle p1; /// put here particle->CHARGE and particle->MASS
     355              p1.smearAng();
     356              p1.smearPos();
     357              p1.setPosition(p1.getX()-500.,p1.getY(),p1.getTX()-1*kickers_on*CRANG,p1.getTY(),0);
     358              p1.set4Momentum(particle->Px,particle->Py,particle->Pz,particle->E);
     359             
     360              H_BeamLine *beamline;
     361              if(particle->Eta >0) beamline = beamline1;
     362              else beamline = beamline2;
     363             
     364              p1.computePath(beamline,1);
     365             
     366              if(p1.stopped(beamline)) {
     367                if (p1.getStoppingElement()->getName()=="rp220_1" || p1.getStoppingElement()->getName()=="rp220_2") {
     368                  p1.propagate(DET->RP220_S);
     369                  elementRP220 = (TRootRomanPotHits*) branchRP220->NewEntry();
     370                  elementRP220->X  = (1E-6)*p1.getX();  // [m]
     371                  elementRP220->Y  = (1E-6)*p1.getY();  // [m]
     372                  elementRP220->Tx = (1E-6)*p1.getTX(); // [rad]
     373                  elementRP220->Ty = (1E-6)*p1.getTY(); // [rad]
     374                  elementRP220->S = p1.getS();          // [m]
     375                  elementRP220->T = -1;                 // not yet implemented
     376                  elementRP220->E = p1.getE();  // not yet implemented
     377                  elementRP220->q2 = -1;                // not yet implemented
     378                  elementRP220->side = sign(particle->Eta);
     379                 
     380                } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") {
     381                  p1.propagate(DET->FP420_S);
     382                  elementFP420 = (TRootRomanPotHits*) branchFP420->NewEntry();
     383                  elementFP420->X  = (1E-6)*p1.getX();  // [m]
     384                  elementFP420->Y  = (1E-6)*p1.getY();  // [m]
     385                  elementFP420->Tx = (1E-6)*p1.getTX(); // [rad]
     386                  elementFP420->Ty = (1E-6)*p1.getTY(); // [rad]
     387                  elementFP420->S = p1.getS();        // [m]
     388                  elementFP420->T = -1;                       // not yet implemented
     389                  elementFP420->E = p1.getE();          // not yet implemented
     390                  elementFP420->q2 = -1;                // not yet implemented
     391                  elementFP420->side = sign(particle->Eta);
    372392                }
    373 
    374 //              if(p1.stopped(beamline) && (p1.getStoppingElement()->getS() > 100))
    375 //                      cout << "Eloss ="  << 7000.-p1.getE() << " ; " << p1.getStoppingElement()->getName() << endl;
     393              }
     394             
     395              //                if(p1.stopped(beamline) && (p1.getStoppingElement()->getS() > 100))
     396              //                        cout << "Eloss ="  << 7000.-p1.getE() << " ; " << p1.getStoppingElement()->getName() << endl;
    376397            } // if forward proton
    377 
     398         
    378399        } // while
    379 
     400     
    380401      // computes the Missing Transverse Momentum
    381402      elementEtmis = (TRootETmis*) branchETmis->NewEntry();
    … …  
    384405      elementEtmis->Px = (-PTmis).Px();
    385406      elementEtmis->Py = (-PTmis).Py();
    386 
     407     
    387408      //*****************************
    388       jets.clear();
     409
     410      // we will have four jet definitions, and the first three will be
     411      // plugins
     412      fastjet::JetDefinition jet_def;
     413      fastjet::JetDefinition::Plugin * plugins;
     414     
    389415      switch(DET->JETALGO) {
    390         default:
    391         case 1: {
    392             JetCluAlgorithm jetAlgoC(DET->C_SEEDTHRESHOLD,DET->CONERADIUS,DET->C_ADJACENCYCUT,DET->C_MAXITERATIONS,DET->C_IRATCH,DET->C_OVERLAPTHRESHOLD);
    393             jetAlgoC.run(towers, jets);
    394           }
    395           break;
    396 
    397         case 2: {
    398             MidPointAlgorithm jetAlgoM(DET->M_SEEDTHRESHOLD,DET->CONERADIUS,DET->M_CONEAREAFRACTION,DET->M_MAXPAIRSIZE,DET->M_MAXITERATIONS,DET->M_OVERLAPTHRESHOLD);
    399             jetAlgoM.run(towers, jets);
    400           }
    401           break;
    402 /*
    403         case 3: {
    404                 FastJet
    405           }
    406           break;
    407 */
    408        } // switch
    409 
    410       // Loop on all jets
    411       // Dealing with jets, tau-jets, b-jets
    412       vector<Cluster>::iterator itJet;
    413       for(itJet = jets.begin(); itJet != jets.end(); ++itJet) {
    414           elementJet = (TRootJet*) branchJet->NewEntry();
    415           jetMomentum = itJet->fourVector;
    416           TLorentzVector JET;
    417           JET.SetPxPyPzE(jetMomentum.px,jetMomentum.py,jetMomentum.pz,jetMomentum.E);
    418           elementJet->Set(JET);
    419          
    420           // b-jets
    421           bool btag=false;
    422           if((fabs(JET.Eta()) < DET->MAX_TRACKER && DET->Btaggedjet(JET, NFCentralQ)))btag=true;
    423           elementJet->Btag = btag;
    424 
    425           // Tau jet identification : 1! track and electromagnetic collimation
    426           if(fabs(JET.Eta()) < (DET->MAX_TRACKER - DET->TAU_CONE_TRACKS)) {
    427               double Energie_tau_central = DET->EnergySmallCone(towers,JET.Eta(),JET.Phi());
    428               if(
    429                   ( Energie_tau_central/JET.E() > DET->TAU_EM_COLLIMATION ) &&
    430                   ( DET->NumTracks(TrackCentral,DET->PT_TRACK_TAU,JET.Eta(),JET.Phi()) == 1 )
    431                 ) {
    432                   elementTauJet = (TRootTauJet*) branchTauJet->NewEntry();
    433                   elementTauJet->Set(JET);
    434                } // if tau jet
    435           } // if JET.eta < tracker - tau_cone : Tau jet identification
    436         } // for itJet : loop on all jets
    437 
     416      default:
     417      case 1: {
     418       
     419        // set up a CDF midpoint jet definition
     420        #ifdef ENABLE_PLUGIN_CDFCONES
     421        plugins = new fastjet::CDFJetCluPlugin(DET->C_SEEDTHRESHOLD,DET->CONERADIUS,DET->C_ADJACENCYCUT,DET->C_MAXITERATIONS,DET->C_IRATCH,DET->C_OVERLAPTHRESHOLD);
     422        jet_def = fastjet::JetDefinition(plugins);
     423        #else
     424        plugins = NULL;
     425        #endif
     426       
     427      }
     428        break;
     429       
     430      case 2: {
     431       
     432        // set up a CDF midpoint jet definition
     433        #ifdef ENABLE_PLUGIN_CDFCONES
     434        plugins = new fastjet::CDFMidPointPlugin (DET->M_SEEDTHRESHOLD,DET->CONERADIUS,DET->M_CONEAREAFRACTION,DET->M_MAXPAIRSIZE,DET->M_MAXPAIRSIZE,DET->C_OVERLAPTHRESHOLD);
     435        jet_def = fastjet::JetDefinition(plugins);
     436        #else
     437        plugins = NULL;
     438        #endif
     439      }
     440        break;
     441       
     442      case 3: {
     443        // set up a siscone jet definition
     444        #ifdef ENABLE_PLUGIN_SISCONE
     445        int npass = 0;               // do infinite number of passes
     446        double protojet_ptmin = 0.0; // use all protojets
     447        plugins = new fastjet::SISConePlugin (DET->CONERADIUS,DET->C_OVERLAPTHRESHOLD,npass, protojet_ptmin);
     448        jet_def = fastjet::JetDefinition(plugins);
     449        #else
     450        plugins = NULL;
     451        #endif
     452      }
     453        break;
     454       
     455      case 4: {
     456        jet_def = fastjet::JetDefinition(fastjet::kt_algorithm, DET->CONERADIUS);
     457        //jet_defs[4] = fastjet::JetDefinition(fastjet::cambridge_algorithm,jet_radius);
     458        //jet_defs[5] = fastjet::JetDefinition(fastjet::antikt_algorithm,jet_radius);
     459      }
     460        break;
     461      }
     462      // run the jet clustering with the above jet definition
     463      if(input_particles.size()!=0)
     464        {
     465          fastjet::ClusterSequence clust_seq(input_particles, jet_def);
     466         
     467         
     468          // extract the inclusive jets with pt > 5 GeV
     469          double ptmin = 5.0;
     470          inclusive_jets = clust_seq.inclusive_jets(ptmin);
     471         
     472          // sort jets into increasing pt
     473          sorted_by_pt(inclusive_jets);
     474        }
     475     
     476      for (unsigned int i = 0; i < inclusive_jets.size(); i++) {
     477        elementJet = (TRootJet*) branchJet->NewEntry();
     478        TLorentzVector JET;
     479        JET.SetPxPyPzE(inclusive_jets[i].px(),inclusive_jets[i].py(),inclusive_jets[i].pz(),inclusive_jets[i].E());
     480        elementJet->Set(JET);
     481        // b-jets
     482        bool btag=false;
     483        if((fabs(JET.Eta()) < DET->MAX_TRACKER && DET->Btaggedjet(JET, NFCentralQ)))btag=true;
     484        elementJet->Btag = btag;
     485       
     486        // Tau jet identification : 1! track and electromagnetic collimation
     487        if(fabs(JET.Eta()) < (DET->MAX_TRACKER - DET->TAU_CONE_TRACKS)) {
     488          double Energie_tau_central = DET->EnergySmallCone(towers,JET.Eta(),JET.Phi());
     489          if(
     490             ( Energie_tau_central/JET.E() > DET->TAU_EM_COLLIMATION ) &&
     491             ( DET->NumTracks(TrackCentral,DET->PT_TRACK_TAU,JET.Eta(),JET.Phi()) == 1 )
     492             ) {
     493            elementTauJet = (TRootTauJet*) branchTauJet->NewEntry();
     494            elementTauJet->Set(JET);
     495          } // if tau jet
     496        } // if JET.eta < tracker - tau_cone : Tau jet identification
     497      } // for itJet : loop on all jets
     498     
    438499      treeWriter->Fill();
    439500      // Add here the trigger

  • trunk/Makefile

    r9 r11  
    2828
    2929
    30 Resolutions$(ExeSuf): \
    31         tmp/Resolutions.$(ObjSuf)
    32 
    33 tmp/Resolutions.$(ObjSuf): \
    34         Resolutions.cpp \
    35         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    36         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    37         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    38         Utilities/CDFCones/interface/JetCluAlgorithm.h \
    39         Utilities/CDFCones/interface/MidPointAlgorithm.h \
    40         Utilities/CDFCones/interface/PhysicsTower.h \
    41         Utilities/CDFCones/interface/Cluster.h \
    42         interface/DataConverter.h \
    43         interface/HEPEVTConverter.h \
    44         interface/LHEFConverter.h \
    45         interface/STDHEPConverter.h \
    46         interface/SmearUtil.h \
    47         interface/TreeClasses.h
    4830Delphes$(ExeSuf): \
    4931        tmp/Delphes.$(ObjSuf)
    … …  
    5436        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    5537        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    56         Utilities/CDFCones/interface/JetCluAlgorithm.h \
    57         Utilities/CDFCones/interface/MidPointAlgorithm.h \
    58         Utilities/CDFCones/interface/PhysicsTower.h \
    59         Utilities/CDFCones/interface/Cluster.h \
    6038        interface/DataConverter.h \
    6139        interface/HEPEVTConverter.h \
    … …  
    6442        interface/SmearUtil.h
    6543EXECUTABLE =  \
    66         Resolutions$(ExeSuf) \
    6744        Delphes$(ExeSuf)
    6845
    6946EXECUTABLE_OBJ =  \
    70         tmp/Resolutions.$(ObjSuf) \
    7147        tmp/Delphes.$(ObjSuf)
    7248
    … …  
    7450        Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h \
    7551        Utilities/ExRootAnalysis/interface/BlockClasses.h
    76 tmp/src/TreeClassesDict.$(SrcSuf): \
    77         src/TreeClassesLinkDef.h
    7852DICT =  \
    79         tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf) \
    80         tmp/src/TreeClassesDict.$(SrcSuf)
     53        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf)
    8154
    8255DICT_OBJ =  \
    83         tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(ObjSuf) \
    84         tmp/src/TreeClassesDict.$(ObjSuf)
    85 
     56        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(ObjSuf)
     57
     58tmp/src/HEPEVTConverter.$(ObjSuf): \
     59        src/HEPEVTConverter.$(SrcSuf) \
     60        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     61        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
     62        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     63        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
     64        interface/HEPEVTConverter.h
     65tmp/src/LHEFConverter.$(ObjSuf): \
     66        src/LHEFConverter.$(SrcSuf) \
     67        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     68        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
     69        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     70        interface/LHEFConverter.h \
     71        Utilities/ExRootAnalysis/interface/LHEF.h
    8672tmp/src/STDHEPConverter.$(ObjSuf): \
    8773        src/STDHEPConverter.$(SrcSuf) \
    … …  
    9480        Utilities/stdhep/stdhep_declarations.h \
    9581        interface/STDHEPConverter.h
    96 tmp/src/TreeClasses.$(ObjSuf): \
    97         src/TreeClasses.$(SrcSuf) \
    98         interface/TreeClasses.h
    99 tmp/src/LHEFConverter.$(ObjSuf): \
    100         src/LHEFConverter.$(SrcSuf) \
    101         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    102         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    103         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    104         interface/LHEFConverter.h \
    105         Utilities/ExRootAnalysis/interface/LHEF.h
    106 tmp/src/HEPEVTConverter.$(ObjSuf): \
    107         src/HEPEVTConverter.$(SrcSuf) \
    108         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    109         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    110         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    111         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    112         interface/HEPEVTConverter.h
    11382tmp/src/SmearUtil.$(ObjSuf): \
    11483        src/SmearUtil.$(SrcSuf) \
    11584        interface/SmearUtil.h
    116 tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf): \
    117         Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(SrcSuf) \
    118         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    119         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h
    12085tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \
    12186        Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf) \
    12287        Utilities/ExRootAnalysis/interface/BlockClasses.h \
    12388        Utilities/ExRootAnalysis/interface/BlockCompare.h
     89tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \
     90        Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf) \
     91        Utilities/ExRootAnalysis/interface/ExRootProgressBar.h
    12492tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \
    12593        Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf) \
    … …  
    12896        Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf) \
    12997        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h
    130 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \
    131         Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf) \
    132         Utilities/ExRootAnalysis/interface/ExRootProgressBar.h
    133 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
    134         Utilities/Hector/src/H_Parameters.$(SrcSuf)
    135 tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
    136         Utilities/Hector/src/H_RomanPot.$(SrcSuf)
    137 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
    138         Utilities/Hector/src/H_Beam.$(SrcSuf)
    139 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
    140         Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
    141 tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \
    142         Utilities/Hector/src/H_RecRPObject.$(SrcSuf)
    143 tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \
    144         Utilities/Hector/src/H_Drift.$(SrcSuf)
    145 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \
    146         Utilities/Hector/src/H_CircularAperture.$(SrcSuf)
    147 tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
    148         Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
    149 tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
    150         Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
    151 tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
    152         Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
    153 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \
    154         Utilities/Hector/src/H_OpticalElement.$(SrcSuf)
    155 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \
    156         Utilities/Hector/src/H_Kicker.$(SrcSuf)
    157 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
    158         Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
     98tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf): \
     99        Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(SrcSuf) \
     100        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     101        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h
    159102tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \
    160103        Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf)
    161104tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \
    162105        Utilities/Hector/src/H_Aperture.$(SrcSuf)
     106tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
     107        Utilities/Hector/src/H_Beam.$(SrcSuf)
     108tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
     109        Utilities/Hector/src/H_BeamLine.$(SrcSuf)
     110tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
     111        Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
    163112tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \
    164113        Utilities/Hector/src/H_BeamParticle.$(SrcSuf)
     114tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \
     115        Utilities/Hector/src/H_CircularAperture.$(SrcSuf)
     116tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \
     117        Utilities/Hector/src/H_Dipole.$(SrcSuf)
     118tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \
     119        Utilities/Hector/src/H_Drift.$(SrcSuf)
     120tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
     121        Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
     122tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \
     123        Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf)
     124tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \
     125        Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf)
     126tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \
     127        Utilities/Hector/src/H_Kicker.$(SrcSuf)
     128tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \
     129        Utilities/Hector/src/H_Marker.$(SrcSuf)
     130tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \
     131        Utilities/Hector/src/H_OpticalElement.$(SrcSuf)
     132tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
     133        Utilities/Hector/src/H_Parameters.$(SrcSuf)
     134tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \
     135        Utilities/Hector/src/H_Quadrupole.$(SrcSuf)
     136tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \
     137        Utilities/Hector/src/H_RecRPObject.$(SrcSuf)
     138tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \
     139        Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf)
     140tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
     141        Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
     142tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
     143        Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
     144tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
     145        Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
     146tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
     147        Utilities/Hector/src/H_RomanPot.$(SrcSuf)
     148tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
     149        Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
    165150tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \
    166151        Utilities/Hector/src/H_TransportMatrices.$(SrcSuf)
    167 tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \
    168         Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf)
    169 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \
    170         Utilities/Hector/src/H_Quadrupole.$(SrcSuf)
    171 tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
    172         Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
    173 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \
    174         Utilities/Hector/src/H_Marker.$(SrcSuf)
    175 tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
    176         Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
    177 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
    178         Utilities/Hector/src/H_BeamLine.$(SrcSuf)
    179 tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \
    180         Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf)
    181152tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \
    182153        Utilities/Hector/src/H_VerticalKicker.$(SrcSuf)
    183 tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \
    184         Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf)
    185 tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \
    186         Utilities/Hector/src/H_Dipole.$(SrcSuf)
    187 tmp/Utilities/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
    188         Utilities/CDFCones/src/MidPointAlgorithm.$(SrcSuf) \
    189         Utilities/CDFCones/interface/MidPointAlgorithm.h \
    190         Utilities/CDFCones/interface/ClusterComparisons.h
    191 tmp/Utilities/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \
    192         Utilities/CDFCones/src/JetCluAlgorithm.$(SrcSuf) \
    193         Utilities/CDFCones/interface/JetCluAlgorithm.h \
    194         Utilities/CDFCones/interface/ClusterComparisons.h \
    195         Utilities/CDFCones/interface/Centroid.h
     154tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
     155        Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
     156tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \
     157        Utilities/Fastjet/src/DnnPlane.$(SrcSuf)
     158tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \
     159        Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf)
     160tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \
     161        Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)
     162tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf): \
     163        Utilities/Fastjet/src/Dnn2piCylinder.$(SrcSuf)
     164tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \
     165        Utilities/Fastjet/src/ClusterSequence.$(SrcSuf)
     166tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \
     167        Utilities/Fastjet/src/PseudoJet.$(SrcSuf)
     168tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \
     169        Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf)
     170tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \
     171        Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf)
     172tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \
     173        Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf)
     174tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \
     175        Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)
     176tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \
     177        Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf)
     178tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \
     179        Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf)
     180tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \
     181        Utilities/Fastjet/src/MinHeap.$(SrcSuf)
     182tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \
     183        Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf)
     184tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
     185        Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf)
     186tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \
     187        Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)
     188tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \
     189        Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf)
     190tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \
     191        Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf)
     192tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf): \
     193        Utilities/Fastjet/src/Voronoi.$(SrcSuf)
     194tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \
     195        Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)
     196tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \
     197        Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf)
     198tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
     199        Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf)
     200tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \
     201        Utilities/Fastjet/src/BasicRandom.$(SrcSuf)
     202tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \
     203        Utilities/Fastjet/src/JetDefinition.$(SrcSuf)
     204tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \
     205        Utilities/Fastjet/src/Error.$(SrcSuf)
     206tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \
     207        Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)
     208tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf): \
     209        Utilities/Fastjet/src/RangeDefinition.$(SrcSuf)
     210tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
     211        Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
     212        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     213tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
     214        Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
     215        Utilities/Fastjet/include/fastjet/ClusterSequence.hh \
     216        Utilities/Fastjet/include/fastjet/Error.hh
     217tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \
     218        Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf)
     219tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \
     220        Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf)
     221tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf): \
     222        Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(SrcSuf)
     223tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \
     224        Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf)
     225tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \
     226        Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(SrcSuf)
     227tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \
     228        Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)
     229tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
     230        Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)
     231tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \
     232        Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf)
     233tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
     234        Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
     235        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     236tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \
     237        Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)
     238tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf): \
     239        Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(SrcSuf)
     240tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \
     241        Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)
     242tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf): \
     243        Utilities/Fastjet/plugins/SISCone/src/momentum.$(SrcSuf)
     244tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \
     245        Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf)
     246tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf): \
     247        Utilities/Fastjet/plugins/SISCone/src/quadtree.$(SrcSuf)
     248tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf): \
     249        Utilities/Fastjet/plugins/SISCone/src/ranlux.$(SrcSuf)
     250tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \
     251        Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)
     252tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \
     253        Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)
     254tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \
     255        Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)
     256tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \
     257        Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)
     258tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \
     259        Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf)
    196260SOURCE_OBJ =  \
     261        tmp/src/HEPEVTConverter.$(ObjSuf) \
     262        tmp/src/LHEFConverter.$(ObjSuf) \
    197263        tmp/src/STDHEPConverter.$(ObjSuf) \
    198         tmp/src/TreeClasses.$(ObjSuf) \
    199         tmp/src/LHEFConverter.$(ObjSuf) \
    200         tmp/src/HEPEVTConverter.$(ObjSuf) \
    201264        tmp/src/SmearUtil.$(ObjSuf) \
    202         tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \
    203265        tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf) \
     266        tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
    204267        tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \
    205268        tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \
    206         tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
    207         tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
    208         tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
    209         tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
    210         tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
    211         tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \
    212         tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \
    213         tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \
    214         tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
    215         tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
    216         tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
    217         tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \
    218         tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \
    219         tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
     269        tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \
    220270        tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \
    221271        tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \
     272        tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
     273        tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
     274        tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
    222275        tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \
     276        tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \
     277        tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \
     278        tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \
     279        tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
     280        tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \
     281        tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \
     282        tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \
     283        tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \
     284        tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \
     285        tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
     286        tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \
     287        tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \
     288        tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \
     289        tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
     290        tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
     291        tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
     292        tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
     293        tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
    223294        tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \
    224         tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \
    225         tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \
    226         tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
    227         tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \
    228         tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
    229         tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
    230         tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \
    231295        tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \
    232         tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \
    233         tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \
    234         tmp/Utilities/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
    235         tmp/Utilities/CDFCones/src/JetCluAlgorithm.$(ObjSuf)
    236 
     296        tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
     297        tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \
     298        tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \
     299        tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \
     300        tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf) \
     301        tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \
     302        tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \
     303        tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \
     304        tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \
     305        tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \
     306        tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \
     307        tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \
     308        tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \
     309        tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \
     310        tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \
     311        tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
     312        tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \
     313        tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \
     314        tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \
     315        tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf) \
     316        tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \
     317        tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \
     318        tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
     319        tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \
     320        tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \
     321        tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \
     322        tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \
     323        tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf) \
     324        tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
     325        tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
     326        tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \
     327        tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \
     328        tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf) \
     329        tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \
     330        tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf) \
     331        tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \
     332        tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
     333        tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \
     334        tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
     335        tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \
     336        tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf) \
     337        tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \
     338        tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf) \
     339        tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \
     340        tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf) \
     341        tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf) \
     342        tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \
     343        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \
     344        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \
     345        tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \
     346        tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf)
     347
     348tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
     349        Utilities/mcfio/mcf_NTuIOFiles.c
     350tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
     351        Utilities/mcfio/mcf_NTuIOUtils.c
     352tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
     353        Utilities/mcfio/mcf_evt_xdr.c
    237354tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \
    238355        Utilities/mcfio/mcf_ntuBldDbinc.c
    239 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \
    240         Utilities/mcfio/mcfio_SeqDummy.c
    241 tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \
    242         Utilities/mcfio/mcfio_Util1.c
    243 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
    244         Utilities/mcfio/mcf_evt_xdr.c
    245 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
    246         Utilities/mcfio/mcf_NTuIOUtils.c
     356tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \
     357        Utilities/mcfio/mcf_ntubldInit.c
    247358tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \
    248359        Utilities/mcfio/mcfio_Block.c
    249360tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf): \
    250361        Utilities/mcfio/mcfio_Direct.c
    251 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
    252         Utilities/mcfio/mcf_NTuIOFiles.c
     362tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \
     363        Utilities/mcfio/mcfio_SeqDummy.c
    253364tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \
    254365        Utilities/mcfio/mcfio_UserDictionary.c
    255 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \
    256         Utilities/mcfio/mcf_ntubldInit.c
     366tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \
     367        Utilities/mcfio/mcfio_Util1.c
     368tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
     369        Utilities/stdhep/mcf_Stdhep_xdr.c \
     370        Utilities/mcfio/mcfio_Dict.h \
     371        Utilities/mcfio/mcf_xdr.h \
     372        Utilities/stdhep/stdhep.h \
     373        Utilities/stdhep/stdtmp.h \
     374        Utilities/stdhep/stdver.h
    257375tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
    258376        Utilities/stdhep/mcf_hepev4_xdr.c \
    … …  
    263381        Utilities/stdhep/stdtmp.h \
    264382        Utilities/stdhep/stdver.h
    265 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
    266         Utilities/stdhep/mcf_stdcm1_xdr.c \
    267         Utilities/mcfio/mcfio_Dict.h \
    268         Utilities/mcfio/mcf_xdr.h \
    269         Utilities/stdhep/stdcm1.h \
    270         Utilities/stdhep/stdver.h
    271383tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \
    272384        Utilities/stdhep/mcf_hepup_xdr.c \
    … …  
    276388        Utilities/stdhep/heprup.h \
    277389        Utilities/stdhep/stdver.h
    278 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
    279         Utilities/stdhep/mcf_Stdhep_xdr.c \
     390tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
     391        Utilities/stdhep/mcf_stdcm1_xdr.c \
    280392        Utilities/mcfio/mcfio_Dict.h \
    281393        Utilities/mcfio/mcf_xdr.h \
    282         Utilities/stdhep/stdhep.h \
    283         Utilities/stdhep/stdtmp.h \
     394        Utilities/stdhep/stdcm1.h \
    284395        Utilities/stdhep/stdver.h
    285396tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
    … …  
    305416        Utilities/stdhep/stdhep_mcfio.h
    306417STDHEP_OBJ =  \
     418        tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
     419        tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
     420        tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
    307421        tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \
    308         tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \
    309         tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \
    310         tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
    311         tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
     422        tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \
    312423        tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \
    313424        tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf) \
    314         tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
     425        tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \
    315426        tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \
    316         tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \
     427        tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \
     428        tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) \
    317429        tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \
     430        tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \
    318431        tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf) \
    319         tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \
    320         tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) \
    321432        tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf) \
    322433        tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf)
    323 
    324 Utilities/CDFCones/interface/MidPointAlgorithm.h: \
    325         Utilities/CDFCones/interface/PhysicsTower.h \
    326         Utilities/CDFCones/interface/Cluster.h
    327         @touch $@
    328434
    329435interface/DataConverter.h: \
    … …  
    335441        Utilities/ExRootAnalysis/interface/BlockClasses.h \
    336442        Utilities/ExRootAnalysis/interface/TSimpleArray.h \
    337         Utilities/CDFCones/interface/PhysicsTower.h \
    338443        interface/DataConverter.h
    339444        @touch $@
    340445
    341 interface/TreeClasses.h: \
    342         Utilities/ExRootAnalysis/interface/BlockCompare.h \
    343         Utilities/ExRootAnalysis/interface/BlockClasses.h
    344         @touch $@
    345 
    346446interface/SmearUtil.h: \
    347447        Utilities/ExRootAnalysis/interface/BlockClasses.h \
    348448        Utilities/ExRootAnalysis/interface/TSimpleArray.h \
    349         Utilities/CDFCones/interface/PhysicsTower.h
     449        Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh
    350450        @touch $@
    351451
    … …  
    356456        @touch $@
    357457
    358 Utilities/CDFCones/interface/Cluster.h: \
    359         Utilities/CDFCones/interface/PhysicsTower.h \
    360         Utilities/CDFCones/interface/LorentzVector.h \
    361         Utilities/CDFCones/interface/Centroid.h
     458Utilities/Fastjet/include/fastjet/Error.hh: \
     459        Utilities/Fastjet/include/fastjet/internal/base.hh
     460        @touch $@
     461
     462Utilities/Fastjet/include/fastjet/ClusterSequence.hh: \
     463        Utilities/Fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh \
     464        Utilities/Fastjet/include/fastjet/PseudoJet.hh \
     465        Utilities/Fastjet/include/fastjet/Error.hh \
     466        Utilities/Fastjet/include/fastjet/JetDefinition.hh
    362467        @touch $@
    363468
    … …  
    374479        @touch $@
    375480
    376 Utilities/CDFCones/interface/PhysicsTower.h: \
    377         Utilities/CDFCones/interface/LorentzVector.h \
    378         Utilities/CDFCones/interface/CalTower.h
    379         @touch $@
    380 
    381 Utilities/CDFCones/interface/JetCluAlgorithm.h: \
    382         Utilities/CDFCones/interface/PhysicsTower.h \
    383         Utilities/CDFCones/interface/Cluster.h
    384         @touch $@
    385 
    386 Utilities/CDFCones/interface/ClusterComparisons.h: \
    387         Utilities/CDFCones/interface/Cluster.h
     481interface/STDHEPConverter.h: \
     482        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     483        Utilities/ExRootAnalysis/interface/TSimpleArray.h \
     484        Utilities/ExRootAnalysis/interface/LHEF.h \
     485        interface/DataConverter.h
    388486        @touch $@
    389487
    390488Utilities/ExRootAnalysis/interface/BlockClasses.h: \
    391489        Utilities/ExRootAnalysis/interface/BlockCompare.h
    392         @touch $@
    393 
    394 interface/STDHEPConverter.h: \
    395         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    396         Utilities/ExRootAnalysis/interface/TSimpleArray.h \
    397         Utilities/CDFCones/interface/PhysicsTower.h \
    398         Utilities/ExRootAnalysis/interface/LHEF.h \
    399         interface/DataConverter.h
    400490        @touch $@
    401491

  • trunk/data/DataCardDet.dat

    r2 r11  
    5454#DeltaR cone definition
    5555CONERADIUS              0.7
    56 JETALGO                 1               // 1 for Cone algorithm, 2 for MidPoint algorithm
     56JETALGO                 3               // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm

  • trunk/genMakefile.tcl

    r9 r11  
    126126  global prefix suffix objSuf exeSuf
    127127   
    128   set executable [glob -nocomplain {Delphes.cpp} {Resolutions.cpp}]
     128  set executable [glob -nocomplain {Delphes.cpp} ]
    129129                               
    130130  set exeFiles {}
    … …  
    232232executableDeps {*.cpp}
    233233
    234 dictDeps {DICT} {Utilities/ExRootAnalysis/src/*LinkDef.h} {src/*LinkDef.h}
    235 
    236 sourceDeps {SOURCE} {src/*.cc} {Utilities/ExRootAnalysis/src/*.cc} {Utilities/Hector/src/*.cc} {Utilities/CDFCones/src/*cc}
     234dictDeps {DICT} {Utilities/ExRootAnalysis/src/*LinkDef.h}
     235
     236sourceDeps {SOURCE} {src/*.cc} {Utilities/ExRootAnalysis/src/*.cc} {Utilities/Hector/src/*.cc} {Utilities/CDFCones/src/*cc} {Utilities/Fastjet/src/*.cc} {Utilities/Fastjet/plugins/CDFCones/*.cc} {Utilities/Fastjet/plugins/CDFCones/src/*.cc} {Utilities/Fastjet/plugins/SISCone/*.cc} {Utilities/Fastjet/plugins/SISCone/src/*.cc}
    237237
    238238stdhepDeps

  • trunk/interface/HEPEVTConverter.h

    r2 r11  
    2727#include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    2828#include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    29 #include "Utilities/CDFCones/interface/PhysicsTower.h"
     29//#include "Utilities/CDFCones/interface/PhysicsTower.h"
    3030#include "interface/DataConverter.h"
    3131using namespace std;

  • trunk/interface/STDHEPConverter.h

    r2 r11  
    2727#include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    2828#include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    29 #include "Utilities/CDFCones/interface/PhysicsTower.h"
     29//#include "Utilities/CDFCones/interface/PhysicsTower.h"
    3030#include "Utilities/ExRootAnalysis/interface/LHEF.h"
    3131

  • trunk/interface/SmearUtil.h

    r2 r11  
    2222#include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    2323
    24 #include "Utilities/CDFCones/interface/PhysicsTower.h"
     24#include "Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh"
    2525using namespace std;
    2626

  • trunk/src/SmearUtil.cc

    r10 r11  
    7676
    7777CONERADIUS   = 0.7;     // generic jet radius ; not for tau's !!!
    78 JETALGO      =   1;
     78JETALGO      =   1;     // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
    7979// Define Cone algorithm.
    8080C_SEEDTHRESHOLD     = 1.0;
Note: See TracChangeset for help on using the changeset viewer.