Fork me on GitHub

Changeset 71 in svn


Ignore:
Timestamp:
Dec 3, 2008, 2:47:52 AM (16 years ago)
Author:
Xavier Rouby
Message:

iEta et iPhi. Verification non complete.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Delphes.cpp

    r70 r71  
    5555  char *appargv[] = {appName, "-b"};
    5656  TApplication app(appName, &appargc, appargv);
    57  
    58   if(argc != 4 && argc != 3) {
    59       cout << " Usage: " << argv[0] << " input_file" << " output_file" << " data_card " << endl;
     57
     58  if(argc != 4 && argc != 3 && argc != 5) {
     59      cout << " Usage: " << argv[0] << " input_file output_file [detector_card] [trigger_card] " << endl;
    6060      cout << " input_list - list of files in Ntpl, StdHep of LHEF format," << endl;
    6161      cout << " output_file - output file." << endl;
    62       cout << " data_card - Datacard containing resolution variables for the detector simulation (optional) "<<endl;
     62      cout << " detector_card - Datacard containing resolution variables for the detector simulation (optional) "<<endl;
     63      cout << " trigger_card - Datacard containing the trigger algorithms (optional) "<<endl;
    6364      exit(1);
    6465  }
    … …  
    9394  DET->Logfile(LogName);
    9495
    95 
    9696  //Trigger information
    97   TriggerTable *TRIGT = new TriggerTable();
    98   TRIGT->TriggerCardReader("data/trigger.dat");
    99   TRIGT->PrintTriggerTable(LogName);
    100   //outputFile->Close();
    101  
     97  //Trigger *TRIG = new Trigger();
     98  //TRIG->TriggerReader("data/trigger.dat");
    10299
    103100  //Propagation of tracks in the B field
    … …  
    231228            {
    232229            genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
    233             //TRACP->Propagation(particle,genMomentum);
     230            TRACP->Propagation(particle,genMomentum);
    234231            float eta=fabs(genMomentum.Eta());
    235232            switch(pid) {
    … …  
    271268                // back of the input_particles vector
    272269                input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E()));
    273  
     270               
    274271                genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E);
    275272                elementCalo = (TRootCalo*) branchCalo->NewEntry();
    276273                elementCalo->Set(genMomentumCalo);
     274                DET->BinEtaPhi(genMomentumCalo.Phi(), genMomentumCalo.Eta(), elementCalo->Phi, elementCalo->Eta);
    277275              }
    278276            }
    … …  
    304302         
    305303        } // while
    306 
    307    // computes the Missing Transverse Momentum
    308    TLorentzVector Att(0.,0.,0.,0.);
    309    for(unsigned int i=0; i < towers.size(); i++)
    310      {
    311         Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E);
    312         PTmis = PTmis + Att;
    313      }
    314    elementEtmis = (TRootETmis*) branchETmis->NewEntry();
    315    elementEtmis->ET = (PTmis).Pt();
    316    elementEtmis->Phi = (-PTmis).Phi();
    317    elementEtmis->Px = (-PTmis).Px();
    318    elementEtmis->Py = (-PTmis).Py();
    319    //*****************************
    320    
     304     
    321305      for(unsigned int i=0; i < electron.size(); i++) {
    322306        if(electron[i].E()!=0 && fabs(electron[i].Eta()) < DET->MAX_TRACKER && electron[i].Pt() > DET->ELEC_pt)
    … …  
    338322      }
    339323     
     324      // computes the Missing Transverse Momentum
     325      TLorentzVector Att(0.,0.,0.,0.);
     326      for(unsigned int i=0; i < towers.size(); i++)
     327        {
     328          Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E);
     329          PTmis = PTmis + Att;
     330        }
     331      elementEtmis = (TRootETmis*) branchETmis->NewEntry();
     332      elementEtmis->ET = (PTmis).Pt();
     333      elementEtmis->Phi = (-PTmis).Phi();
     334      elementEtmis->Px = (-PTmis).Px();
     335      elementEtmis->Py = (-PTmis).Py();
     336
     337      //*****************************
     338      treeWriter->Fill();
     339     
    340340      sorted_jets=JETRUN->RunJets(input_particles);
    341341      JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ);
    … …  
    344344      // Add here the trigger
    345345      // Should test all the trigger table on the event, based on reconstructed objects
    346       treeWriter->Fill();
    347      
     346     
    348347    } // Loop over all events
    349  
     348
    350349  treeWriter->Write();
     350 
     351  cout << "** Exiting..." << endl;
     352 
    351353  delete treeWriter;
    352  
    353   if(DET->DOTRIGGER == 1)
    354     {
    355       TChain chainT("Analysis");
    356       chainT.Add(outputfilename.c_str());
    357       ExRootTreeReader *treeReaderT = new ExRootTreeReader(&chainT);
    358      
    359       const TClonesArray *branchElecTrig = treeReaderT->UseBranch("Electron");
    360       const TClonesArray *branchMuonTrig = treeReaderT->UseBranch("Muon");
    361       const TClonesArray *branchJetTrig = treeReaderT->UseBranch("Jet");
    362       const TClonesArray *branchTauJetTrig = treeReaderT->UseBranch("TauJet");
    363       const TClonesArray *branchPhotonTrig = treeReaderT->UseBranch("Photon");
    364       const TClonesArray *branchETmisTrig = treeReaderT->UseBranch("ETmis");
    365      
    366       ExRootTreeWriter *treeWriterT = new ExRootTreeWriter(outputfilename, "Trigger");
    367       ExRootTreeBranch *branchTrigger = treeWriterT->NewBranch("TrigResult", TRootTrigger::Class());
    368      
    369       TRootTrigger *elementTrigger;
    370      
    371       Long64_t entryT, allEntriesT = treeReaderT->GetEntries();
    372       cout << "** Chain contains " << allEntriesT << " events" << endl;
    373       for(entryT = 0; entryT < allEntriesT; ++entryT)
    374         {
    375           treeWriterT->Clear();
    376           treeReaderT->ReadEntry(entry);
    377           elementTrigger = (TRootTrigger*) branchTrigger->NewEntry();
    378           elementTrigger->Accepted=1;
    379           treeWriterT->Fill();
    380         }
    381      
    382       treeWriterT->Write();
    383       delete treeWriterT;
    384     }
    385  
    386   cout << "** Exiting..." << endl;
    387  
    388354  delete treeReader;
    389355  delete DET;
    390356  if(converter) delete converter;
    391  
     357
    392358  todo("TODO");
    393359}

  • trunk/Makefile

    r55 r71  
    6262        Utilities/Fastjet/include/fastjet/config.h \
    6363        interface/TreeClasses.h
    64 h_bb$(ExeSuf): \
    65         tmp/h_bb.$(ObjSuf)
    66 
    67 tmp/h_bb.$(ObjSuf): \
    68         h_bb.cpp \
    69         Utilities/ExRootAnalysis/interface/TSimpleArray.h \
    70         Utilities/ExRootAnalysis/interface/TSimpleBranch.h \
    71         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    72         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    73         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    74         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    75         interface/TUtil.h \
    76         interface/h_bb.h
    7764EXECUTABLE =  \
    7865        Delphes$(ExeSuf) \
    79         Resolutions$(ExeSuf) \
    80         h_bb$(ExeSuf)
     66        Resolutions$(ExeSuf)
    8167
    8268EXECUTABLE_OBJ =  \
    8369        tmp/Delphes.$(ObjSuf) \
    84         tmp/Resolutions.$(ObjSuf) \
    85         tmp/h_bb.$(ObjSuf)
     70        tmp/Resolutions.$(ObjSuf)
    8671
    8772tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf): \
    … …  
    9984        tmp/src/TreeClassesDict.$(ObjSuf)
    10085
    101 tmp/src/h_bb.$(ObjSuf): \
    102         src/h_bb.$(SrcSuf) \
    103         interface/h_bb.h
    104 tmp/src/HEPEVTConverter.$(ObjSuf): \
    105         src/HEPEVTConverter.$(SrcSuf) \
    106         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    107         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    108         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    109         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    110         interface/HEPEVTConverter.h
    111 tmp/src/LHEFConverter.$(ObjSuf): \
    112         src/LHEFConverter.$(SrcSuf) \
    113         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    114         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    115         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    116         interface/LHEFConverter.h \
    117         Utilities/ExRootAnalysis/interface/LHEF.h
    118 tmp/src/STDHEPConverter.$(ObjSuf): \
    119         src/STDHEPConverter.$(SrcSuf) \
    120         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    121         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    122         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    123         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
    124         Utilities/ExRootAnalysis/interface/LHEF.h \
    125         Utilities/stdhep/stdhep_mcfio.h \
    126         Utilities/stdhep/stdhep_declarations.h \
    127         interface/STDHEPConverter.h
     86tmp/src/JetUtils.$(ObjSuf): \
     87        src/JetUtils.$(SrcSuf) \
     88        interface/JetUtils.h
    12889tmp/src/SmearUtil.$(ObjSuf): \
    12990        src/SmearUtil.$(SrcSuf) \
    13091        interface/SmearUtil.h
    131 tmp/src/TreeClasses.$(ObjSuf): \
    132         src/TreeClasses.$(SrcSuf) \
    133         interface/TreeClasses.h
    134 tmp/src/TUtil.$(ObjSuf): \
    135         src/TUtil.$(SrcSuf) \
    136         interface/TUtil.h
    13792tmp/src/TriggerUtil.$(ObjSuf): \
    13893        src/TriggerUtil.$(SrcSuf) \
    … …  
    14196        src/BFieldProp.$(SrcSuf) \
    14297        interface/BFieldProp.h
    143 tmp/src/JetUtils.$(ObjSuf): \
    144         src/JetUtils.$(SrcSuf) \
    145         interface/JetUtils.h
    14698tmp/src/VeryForward.$(ObjSuf): \
    14799        src/VeryForward.$(SrcSuf) \
    148100        interface/VeryForward.h \
    149101        interface/SmearUtil.h
    150 tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \
    151         Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf) \
    152         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    153         Utilities/ExRootAnalysis/interface/BlockCompare.h
     102tmp/src/LHEFConverter.$(ObjSuf): \
     103        src/LHEFConverter.$(SrcSuf) \
     104        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     105        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
     106        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     107        interface/LHEFConverter.h \
     108        Utilities/ExRootAnalysis/interface/LHEF.h
     109tmp/src/STDHEPConverter.$(ObjSuf): \
     110        src/STDHEPConverter.$(SrcSuf) \
     111        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     112        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
     113        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     114        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
     115        Utilities/ExRootAnalysis/interface/LHEF.h \
     116        Utilities/stdhep/stdhep_mcfio.h \
     117        Utilities/stdhep/stdhep_declarations.h \
     118        interface/STDHEPConverter.h
     119tmp/src/HEPEVTConverter.$(ObjSuf): \
     120        src/HEPEVTConverter.$(SrcSuf) \
     121        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     122        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
     123        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
     124        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
     125        interface/HEPEVTConverter.h
     126tmp/src/TreeClasses.$(ObjSuf): \
     127        src/TreeClasses.$(SrcSuf) \
     128        interface/TreeClasses.h
     129tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf): \
     130        Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf) \
     131        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h
     132tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \
     133        Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf) \
     134        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h
    154135tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \
    155136        Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf) \
    156137        Utilities/ExRootAnalysis/interface/ExRootProgressBar.h
    157 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \
    158         Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf) \
    159         Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h
    160 tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf): \
    161         Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf) \
    162         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h
    163138tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf): \
    164139        Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(SrcSuf) \
    165140        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    166141        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h
    167 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \
    168         Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf)
    169 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \
    170         Utilities/Hector/src/H_Aperture.$(SrcSuf)
    171 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
    172         Utilities/Hector/src/H_Beam.$(SrcSuf)
    173 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
    174         Utilities/Hector/src/H_BeamLine.$(SrcSuf)
    175 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
    176         Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
    177 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \
    178         Utilities/Hector/src/H_BeamParticle.$(SrcSuf)
     142tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \
     143        Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf) \
     144        Utilities/ExRootAnalysis/interface/BlockClasses.h \
     145        Utilities/ExRootAnalysis/interface/BlockCompare.h
     146tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \
     147        Utilities/Hector/src/H_Kicker.$(SrcSuf)
     148tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \
     149        Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf)
     150tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
     151        Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
     152tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
     153        Utilities/Hector/src/H_RomanPot.$(SrcSuf)
    179154tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \
    180155        Utilities/Hector/src/H_CircularAperture.$(SrcSuf)
     156tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \
     157        Utilities/Hector/src/H_TransportMatrices.$(SrcSuf)
    181158tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \
    182159        Utilities/Hector/src/H_Dipole.$(SrcSuf)
    183160tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \
    184161        Utilities/Hector/src/H_Drift.$(SrcSuf)
    185 tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \
    186         Utilities/Hector/src/H_EllipticAperture.$(SrcSuf)
     162tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \
     163        Utilities/Hector/src/H_Aperture.$(SrcSuf)
    187164tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \
    188165        Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf)
    189 tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \
    190         Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf)
    191 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \
    192         Utilities/Hector/src/H_Kicker.$(SrcSuf)
     166tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
     167        Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
     168tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
     169        Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
     170tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \
     171        Utilities/Hector/src/H_VerticalKicker.$(SrcSuf)
     172tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
     173        Utilities/Hector/src/H_Parameters.$(SrcSuf)
     174tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
     175        Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
     176tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \
     177        Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)
     178tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
     179        Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
    193180tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \
    194181        Utilities/Hector/src/H_Marker.$(SrcSuf)
    195182tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \
    196183        Utilities/Hector/src/H_OpticalElement.$(SrcSuf)
    197 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \
    198         Utilities/Hector/src/H_Parameters.$(SrcSuf)
    199184tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \
    200185        Utilities/Hector/src/H_Quadrupole.$(SrcSuf)
     186tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \
     187        Utilities/Hector/src/H_BeamLine.$(SrcSuf)
     188tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
     189        Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
     190tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \
     191        Utilities/Hector/src/H_BeamParticle.$(SrcSuf)
     192tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \
     193        Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf)
    201194tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \
    202195        Utilities/Hector/src/H_RecRPObject.$(SrcSuf)
     196tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \
     197        Utilities/Hector/src/H_Beam.$(SrcSuf)
    203198tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \
    204199        Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf)
    205 tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \
    206         Utilities/Hector/src/H_RectangularAperture.$(SrcSuf)
    207 tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \
    208         Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf)
    209 tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \
    210         Utilities/Hector/src/H_RectangularDipole.$(SrcSuf)
    211 tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \
    212         Utilities/Hector/src/H_RomanPot.$(SrcSuf)
    213 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \
    214         Utilities/Hector/src/H_SectorDipole.$(SrcSuf)
    215 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \
    216         Utilities/Hector/src/H_TransportMatrices.$(SrcSuf)
    217 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \
    218         Utilities/Hector/src/H_VerticalKicker.$(SrcSuf)
    219 tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \
    220         Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf)
    221 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \
    222         Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)
     200tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
     201        Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf)
     202tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \
     203        Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)
     204tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \
     205        Utilities/Fastjet/src/Error.$(SrcSuf)
     206tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \
     207        Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf)
     208tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \
     209        Utilities/Fastjet/src/DnnPlane.$(SrcSuf)
     210tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \
     211        Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)
    223212tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \
    224213        Utilities/Fastjet/src/BasicRandom.$(SrcSuf)
    225 tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \
    226         Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf)
    227 tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \
    228         Utilities/Fastjet/src/ClusterSequence.$(SrcSuf)
    229 tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
    230         Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf)
    231214tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \
    232215        Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf)
    233 tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
    234         Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf)
    235 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \
    236         Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)
     216tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \
     217        Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf)
     218tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \
     219        Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf)
     220tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \
     221        Utilities/Fastjet/src/JetDefinition.$(SrcSuf)
     222tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \
     223        Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)
    237224tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \
    238225        Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf)
    239226tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \
    240227        Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf)
    241 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \
    242         Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)
    243228tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \
    244229        Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf)
    245 tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \
    246         Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf)
    247 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \
    248         Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)
    249 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \
    250         Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf)
    251 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \
    252         Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf)
    253 tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf): \
    254         Utilities/Fastjet/src/Dnn2piCylinder.$(SrcSuf)
    255 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \
    256         Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)
     230tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \
     231        Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf)
    257232tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \
    258233        Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf)
    259 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \
    260         Utilities/Fastjet/src/DnnPlane.$(SrcSuf)
    261 tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \
    262         Utilities/Fastjet/src/Error.$(SrcSuf)
    263 tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \
    264         Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf)
    265 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \
    266         Utilities/Fastjet/src/JetDefinition.$(SrcSuf)
    267234tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \
    268235        Utilities/Fastjet/src/MinHeap.$(SrcSuf)
    269236tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \
    270237        Utilities/Fastjet/src/PseudoJet.$(SrcSuf)
     238tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \
     239        Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf)
    271240tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf): \
    272241        Utilities/Fastjet/src/RangeDefinition.$(SrcSuf)
     242tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \
     243        Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)
     244tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \
     245        Utilities/Fastjet/src/ClusterSequence.$(SrcSuf)
     246tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
     247        Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf)
     248tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \
     249        Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)
    273250tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf): \
    274251        Utilities/Fastjet/src/Voronoi.$(SrcSuf)
    275 tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
    276         Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
    277         Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     252tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf): \
     253        Utilities/Fastjet/src/Dnn2piCylinder.$(SrcSuf)
    278254tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
    279255        Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
    280256        Utilities/Fastjet/include/fastjet/ClusterSequence.hh \
    281257        Utilities/Fastjet/include/fastjet/Error.hh
     258tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
     259        Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
     260        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     261tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \
     262        Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf)
    282263tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \
    283264        Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf)
    284 tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \
    285         Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf)
     265tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \
     266        Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf)
     267tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
     268        Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)
     269tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \
     270        Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)
     271tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \
     272        Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(SrcSuf)
    286273tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf): \
    287274        Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(SrcSuf)
    288275tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \
    289276        Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf)
    290 tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \
    291         Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(SrcSuf)
    292 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \
    293         Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)
    294 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \
    295         Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)
    296 tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \
    297         Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf)
    298277tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
    299278        Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
    300279        Utilities/Fastjet/include/fastjet/ClusterSequence.hh
     280tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \
     281        Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)
     282tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \
     283        Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)
     284tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \
     285        Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)
     286tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf): \
     287        Utilities/Fastjet/plugins/SISCone/src/ranlux.$(SrcSuf)
     288tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \
     289        Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf)
     290tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \
     291        Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)
     292tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \
     293        Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)
     294tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \
     295        Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf)
     296tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \
     297        Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)
    301298tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf): \
    302299        Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(SrcSuf)
    303 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \
    304         Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)
    305300tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf): \
    306301        Utilities/Fastjet/plugins/SISCone/src/momentum.$(SrcSuf)
    307 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \
    308         Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)
    309 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \
    310         Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf)
    311302tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf): \
    312303        Utilities/Fastjet/plugins/SISCone/src/quadtree.$(SrcSuf)
    313 tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf): \
    314         Utilities/Fastjet/plugins/SISCone/src/ranlux.$(SrcSuf)
    315 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \
    316         Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)
    317 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \
    318         Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)
    319 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \
    320         Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)
    321 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \
    322         Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)
    323 tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \
    324         Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf)
    325304SOURCE_OBJ =  \
    326         tmp/src/h_bb.$(ObjSuf) \
    327         tmp/src/HEPEVTConverter.$(ObjSuf) \
     305        tmp/src/JetUtils.$(ObjSuf) \
     306        tmp/src/SmearUtil.$(ObjSuf) \
     307        tmp/src/TriggerUtil.$(ObjSuf) \
     308        tmp/src/BFieldProp.$(ObjSuf) \
     309        tmp/src/VeryForward.$(ObjSuf) \
    328310        tmp/src/LHEFConverter.$(ObjSuf) \
    329311        tmp/src/STDHEPConverter.$(ObjSuf) \
    330         tmp/src/SmearUtil.$(ObjSuf) \
     312        tmp/src/HEPEVTConverter.$(ObjSuf) \
    331313        tmp/src/TreeClasses.$(ObjSuf) \
    332         tmp/src/TUtil.$(ObjSuf) \
    333         tmp/src/TriggerUtil.$(ObjSuf) \
    334         tmp/src/BFieldProp.$(ObjSuf) \
    335         tmp/src/JetUtils.$(ObjSuf) \
    336         tmp/src/VeryForward.$(ObjSuf) \
     314        tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \
     315        tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \
     316        tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
     317        tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \
    337318        tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf) \
    338         tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \
    339         tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \
    340         tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \
    341         tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \
    342         tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \
    343         tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \
    344         tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
    345         tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
    346         tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
    347         tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \
     319        tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \
     320        tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \
     321        tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
     322        tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
    348323        tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \
     324        tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \
    349325        tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \
    350326        tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \
    351         tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \
     327        tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \
    352328        tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \
    353         tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \
    354         tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \
     329        tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
     330        tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
     331        tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \
     332        tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
     333        tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
     334        tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \
     335        tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
    355336        tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \
    356337        tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \
    357         tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \
    358338        tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \
     339        tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \
     340        tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
     341        tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \
     342        tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \
    359343        tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \
     344        tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \
    360345        tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \
    361         tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \
    362         tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \
    363         tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \
    364         tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \
    365         tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \
    366         tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \
    367         tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \
    368         tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \
    369         tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \
     346        tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
     347        tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \
     348        tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \
     349        tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \
     350        tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \
     351        tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \
    370352        tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \
    371         tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \
    372         tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \
    373         tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
    374353        tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \
    375         tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
    376         tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \
     354        tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \
     355        tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \
     356        tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \
     357        tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \
    377358        tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \
    378359        tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \
    379         tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \
    380360        tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \
    381         tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \
    382         tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \
    383         tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \
    384         tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \
    385         tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf) \
    386         tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \
     361        tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \
    387362        tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \
    388         tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \
    389         tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \
    390         tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \
    391         tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \
    392363        tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \
    393364        tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \
     365        tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \
    394366        tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf) \
     367        tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \
     368        tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \
     369        tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
     370        tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \
    395371        tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf) \
     372        tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf) \
     373        tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
    396374        tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
    397         tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
     375        tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \
    398376        tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \
    399         tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \
     377        tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \
     378        tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
     379        tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \
     380        tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf) \
    400381        tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf) \
    401382        tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \
    402         tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf) \
    403         tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \
    404         tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \
    405         tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \
    406383        tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
     384        tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \
     385        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \
     386        tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \
     387        tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf) \
     388        tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf) \
     389        tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \
     390        tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \
     391        tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \
     392        tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \
    407393        tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf) \
    408         tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \
    409394        tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf) \
    410         tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \
    411         tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \
    412         tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf) \
    413         tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf) \
    414         tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \
    415         tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \
    416         tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \
    417         tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \
    418         tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf)
    419 
    420 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
    421         Utilities/mcfio/mcf_NTuIOFiles.c
    422 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
    423         Utilities/mcfio/mcf_NTuIOUtils.c
    424 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
    425         Utilities/mcfio/mcf_evt_xdr.c
    426 tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \
    427         Utilities/mcfio/mcf_ntuBldDbinc.c
    428 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \
    429         Utilities/mcfio/mcf_ntubldInit.c
    430 tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \
    431         Utilities/mcfio/mcfio_Block.c
    432 tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf): \
    433         Utilities/mcfio/mcfio_Direct.c
    434 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \
    435         Utilities/mcfio/mcfio_SeqDummy.c
     395        tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf)
     396
    436397tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \
    437398        Utilities/mcfio/mcfio_UserDictionary.c
    438399tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \
    439400        Utilities/mcfio/mcfio_Util1.c
    440 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
    441         Utilities/stdhep/mcf_Stdhep_xdr.c \
    442         Utilities/mcfio/mcfio_Dict.h \
    443         Utilities/mcfio/mcf_xdr.h \
    444         Utilities/stdhep/stdhep.h \
    445         Utilities/stdhep/stdtmp.h \
    446         Utilities/stdhep/stdver.h
    447 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
    448         Utilities/stdhep/mcf_hepev4_xdr.c \
    449         Utilities/mcfio/mcfio_Dict.h \
    450         Utilities/mcfio/mcf_xdr.h \
    451         Utilities/stdhep/stdhep.h \
    452         Utilities/stdhep/hepev4.h \
    453         Utilities/stdhep/stdtmp.h \
    454         Utilities/stdhep/stdver.h
     401tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \
     402        Utilities/mcfio/mcf_ntuBldDbinc.c
     403tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \
     404        Utilities/mcfio/mcfio_SeqDummy.c
     405tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \
     406        Utilities/mcfio/mcfio_Block.c
     407tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \
     408        Utilities/mcfio/mcf_evt_xdr.c
     409tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf): \
     410        Utilities/mcfio/mcfio_Direct.c
     411tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \
     412        Utilities/mcfio/mcf_ntubldInit.c
     413tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \
     414        Utilities/mcfio/mcf_NTuIOUtils.c
     415tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \
     416        Utilities/mcfio/mcf_NTuIOFiles.c
    455417tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \
    456418        Utilities/stdhep/mcf_hepup_xdr.c \
    … …  
    460422        Utilities/stdhep/heprup.h \
    461423        Utilities/stdhep/stdver.h
    462 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
    463         Utilities/stdhep/mcf_stdcm1_xdr.c \
    464         Utilities/mcfio/mcfio_Dict.h \
    465         Utilities/mcfio/mcf_xdr.h \
    466         Utilities/stdhep/stdcm1.h \
    467         Utilities/stdhep/stdver.h
    468 tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
    469         Utilities/stdhep/stdhep_internal_utils.c \
    470         Utilities/stdhep/stdhep.h \
    471         Utilities/stdhep/hepev4.h \
    472         Utilities/stdhep/stdtmp.h \
    473         Utilities/stdhep/hepeup.h
    474424tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf): \
    475425        Utilities/stdhep/stdhep_mcfio.c \
    … …  
    487437        Utilities/stdhep/stdcnt.h \
    488438        Utilities/stdhep/stdhep_mcfio.h
     439tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
     440        Utilities/stdhep/mcf_hepev4_xdr.c \
     441        Utilities/mcfio/mcfio_Dict.h \
     442        Utilities/mcfio/mcf_xdr.h \
     443        Utilities/stdhep/stdhep.h \
     444        Utilities/stdhep/hepev4.h \
     445        Utilities/stdhep/stdtmp.h \
     446        Utilities/stdhep/stdver.h
     447tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
     448        Utilities/stdhep/mcf_Stdhep_xdr.c \
     449        Utilities/mcfio/mcfio_Dict.h \
     450        Utilities/mcfio/mcf_xdr.h \
     451        Utilities/stdhep/stdhep.h \
     452        Utilities/stdhep/stdtmp.h \
     453        Utilities/stdhep/stdver.h
     454tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
     455        Utilities/stdhep/mcf_stdcm1_xdr.c \
     456        Utilities/mcfio/mcfio_Dict.h \
     457        Utilities/mcfio/mcf_xdr.h \
     458        Utilities/stdhep/stdcm1.h \
     459        Utilities/stdhep/stdver.h
     460tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
     461        Utilities/stdhep/stdhep_internal_utils.c \
     462        Utilities/stdhep/stdhep.h \
     463        Utilities/stdhep/hepev4.h \
     464        Utilities/stdhep/stdtmp.h \
     465        Utilities/stdhep/hepeup.h
    489466STDHEP_OBJ =  \
    490         tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
    491         tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
    492         tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
    493         tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \
    494         tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \
    495         tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \
    496         tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf) \
    497         tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \
    498467        tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \
    499468        tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \
     469        tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \
     470        tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \
     471        tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \
     472        tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \
     473        tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf) \
     474        tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \
     475        tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \
     476        tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \
     477        tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \
     478        tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf) \
     479        tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \
    500480        tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) \
    501         tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \
    502         tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \
    503481        tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf) \
    504         tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf) \
    505         tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf)
    506 
    507 interface/TUtil.h: \
    508         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    509         Utilities/ExRootAnalysis/interface/TSimpleArray.h
    510         @touch $@
     482        tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf)
    511483
    512484interface/DataConverter.h: \
    … …  
    583555        Utilities/stdhep/stdcm1.h \
    584556        Utilities/stdhep/stdver.h
    585         @touch $@
    586 
    587 interface/h_bb.h: \
    588         Utilities/ExRootAnalysis/interface/TSimpleArray.h \
    589         Utilities/ExRootAnalysis/interface/TSimpleBranch.h \
    590         Utilities/ExRootAnalysis/interface/BlockClasses.h \
    591         Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
    592         Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
    593         interface/TUtil.h
    594557        @touch $@
    595558

  • trunk/README

    r36 r71  
    4747
    4848attention à CalTower.hh qui est hyper spécifiqueà CMS, aprÚs les changements. comment introduire ça dans la carte?
     49
     50
     51attention : Trigger::
     52void TriggerBit::PrintTrigCondition(string LogName,int i)
     53 --> il y a a déjà un i défini ailleurs dans la fonction
     54
     55Dans la lecture de la carte, on ne vérifie pas qu'il y a NTOWER+1 valeurs pour les TOWER_ETA_EDGE et NTOWER pour TOWER_DPHI
     56

  • trunk/data/DataCardDet.dat

    r69 r71  
    44MAX_CALO_FWD     5.0                    // forward calorimeter pseudorapidity coverage
    55MAX_MU           2.4                    // muon chambers pseudorapidity coverage
    6 MIN_CALO_VFWD    5.2                    // very forward calorimeter (if any), like CASTOR
     6MIN_CALO_VFWD    5.2                    // very forward calorimeter (if any) like CASTOR
    77MAX_CALO_VFWD    6.6
    88MIN_ZDC          8.3
    9 ZDC_S            140                    // distance of the ZDC to the IP, in meters
    10 RP220_S          220                    // distance of the RP to the IP, in meters
    11 RP220_X          0.002                  // distance of the RP to the beam, in meters
    12 FP420_S          420                    // distance of the RP to the IP, in meters
    13 FP420_X          0.004                  // distance of the RP to the beam, in meters
     9ZDC_S            140                    // distance of the ZDC to the IP in meters
     10RP220_S          220                    // distance of the RP to the IP in meters
     11RP220_X          0.002                  // distance of the RP to the beam in meters
     12FP420_S          420                    // distance of the RP to the IP in meters
     13FP420_X          0.004                  // distance of the RP to the beam in meters
    1414
    1515#Magnetic Field
    … …  
    2626ELG_Ncen         0.25                   // N term for central ECAL
    2727ELG_Ccen         0.0055                 // C term for central ECAL
    28 ELG_Sfwd         1.5                    // S term for forward ECAL
     28ELG_Cfwd         0.107                  // S term for forward ECAL
     29ELG_Sfwd         2.084                  // C term for forward ECAL
    2930ELG_Nfwd         0.0                    // N term for central ECAL
    30 ELG_Cfwd         0.06                   // C term for forward ECAL
    3131
    3232#energy resolution for hadrons in ecal/hcal/hf
    … …  
    5454
    5555#Tracker acceptance
    56 PT_TRACKS_MIN    0.9                     // minimal pt needed to reach the calorimeter, in GeV
     56PT_TRACKS_MIN    0.9                     // minimal pt needed to reach the calorimeter in GeV
    5757TRACKING_EFF     100                     // efficiency associated to the tracking
    5858
    … …  
    6363
    6464#DeltaR cone definition
    65 CONERADIUS              0.7
    66 JETALGO                 1               // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
     65CONERADIUS      0.7
     66JETALGO           1               // 1 for Cone algorithm 2 for MidPoint algorithm 3 for SIScone algorithm 4 for kt algorithm
    6767
    68 DOTRIGGER               1
     68#Calorimetric towers
     69NTOWERS         40
     70TOWER_ETA_EDGES 0. 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.870 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653 1.740 1.830 1.930 2.043 2.172 2.322 2.500 2.650 2.868 2.950 3.125 3.300 3.475 3.650 3.825 4.000 4.175 4.350 4.525 4.700 5.000
     71# list of the edges of each tower in eta for eta>0 assuming a symmetric detector in eta<0
     72# the list starts with the lower edge of the most central tower
     73# the list ends with the higher edged of the most forward tower
     74# there should be NTOWER+1 values
     75TOWER_DPHI 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20
     76# list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
     77# the list starts with the phi-size of the most central tower (eta=0)
     78# the list ends with the phi-size of the most forward tower
     79# there should be NTOWER values

  • trunk/interface/SmearUtil.h

    r69 r71  
    119119  double PROTOJET_PTMIN;
    120120
    121   int DOTRIGGER;
     121  // Define Calorimetric towers
     122  unsigned int NTOWERS;
     123  float * TOWER_ETA_EDGES;
     124  float * TOWER_DPHI;
     125
    122126
    123127  /// Reads the data card for the initialisation of the parameters
    … …  
    150154  //******************************isolation criteria**************************************
    151155  bool Isolation(Float_t phi,Float_t eta,const vector<TLorentzVector> &tracks,float PT_TRACK2);
     156
     157  //********************* returns a segmented value for eta and phi, for calo towers *****
     158  void BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta);
    152159
    153160};

  • trunk/src/SmearUtil.cc

    r69 r71  
    5252ELG_Ncen =        0.25 ;                 // N term for central ECAL
    5353ELG_Ccen =        0.0055 ;                // C term for central ECAL
    54 ELG_Sfwd =        1.5;                    // S term for forward ECAL
    55 ELG_Nfwd =        0.0;                    // N term for central ECAL
    56 ELG_Cfwd =        0.06;                   // C term for forward ECAL
     54ELG_Cfwd =        0.107 ;                 // S term for forward ECAL
     55ELG_Sfwd =        2.084 ;                 // C term for forward ECAL
     56ELG_Nfwd =        0.0   ;                 // N term for central ECAL
    5757
    5858HAD_Shcal =       1.5 ;                    // S term for central HCAL // hadronic calorimeter
    … …  
    104104M_MAXITERATIONS     =   100;
    105105
     106// Define Calorimeter Towers
     107NTOWERS = 40;
     108
     109const float tower_eta_edges[41] = {
     110    0., 0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.696, 0.783, 0.870, 0.957, 1.044, 1.131, 1.218, 1.305, 1.392, 1.479, 1.566,
     111    1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500, 2.650, 2.868, 2.950, 3.125, 3.300, 3.475, 3.650, 3.825, 4.000, 4.175,
     112    4.350, 4.525,  4.700, 5.000}; // temporary object
     113TOWER_ETA_EDGES = new float[NTOWERS+1];
     114for(unsigned int i=0; i<NTOWERS+1; i++) TOWER_ETA_EDGES[i] = tower_eta_edges[i];
     115
     116const float tower_dphi[40] = {
     117     5, 5, 5, 5, 5,  5, 5, 5, 5, 5,  5, 5, 5, 5, 5,  5, 5, 5, 5, 10,
     118    10,10,10,10,10, 10,10,10,10,10, 10,10,10,10,10, 10,10,10,20, 20 }; // temporary object
     119TOWER_DPHI = new float[NTOWERS];
     120for(unsigned int i=0; i<NTOWERS; i++) TOWER_DPHI[i] = tower_dphi[i];
     121
    106122}
    107123
    … …  
    122138    curstring.str(temp_string);
    123139    string varname;
    124     float value;
     140    float value; int ivalue;
    125141   
    126142    if(strstr(temp_string.c_str(),"#")) { }
    … …  
    129145    else if(strstr(temp_string.c_str(),"MAX_CALO_FWD")){curstring >> varname >> value; MAX_CALO_FWD = value;}
    130146    else if(strstr(temp_string.c_str(),"MAX_MU")){curstring >> varname >> value; MAX_MU = value;}
    131     else if(strstr(temp_string.c_str(),"TRACKING_RADIUS")){curstring >> varname >> value; TRACKING_RADIUS = (int)value;}
    132     else if(strstr(temp_string.c_str(),"TRACKING_LENGTH")){curstring >> varname >> value; TRACKING_LENGTH = (int)value;}
     147    else if(strstr(temp_string.c_str(),"TRACKING_RADIUS")){curstring >> varname >> ivalue; TRACKING_RADIUS = ivalue;}
     148    else if(strstr(temp_string.c_str(),"TRACKING_LENGTH")){curstring >> varname >> ivalue; TRACKING_LENGTH = ivalue;}
    133149    else if(strstr(temp_string.c_str(),"BFIELD_X")){curstring >> varname >> value; BFIELD_X = value;}
    134150    else if(strstr(temp_string.c_str(),"BFIELD_Y")){curstring >> varname >> value; BFIELD_Y = value;}
    … …  
    151167    else if(strstr(temp_string.c_str(),"PT_TRACK_TAU")){curstring >> varname >> value; PT_TRACK_TAU = value;}
    152168    else if(strstr(temp_string.c_str(),"PT_TRACKS_MIN")){curstring >> varname >> value; PT_TRACKS_MIN = value;}
    153     else if(strstr(temp_string.c_str(),"TAGGING_B")){curstring >> varname >> value; TAGGING_B = (int)value;}
    154     else if(strstr(temp_string.c_str(),"MISTAGGING_C")){curstring >> varname >> value; MISTAGGING_C = (int)value;}
    155     else if(strstr(temp_string.c_str(),"MISTAGGING_L")){curstring >> varname >> value; MISTAGGING_L = (int)value;}
     169    else if(strstr(temp_string.c_str(),"TAGGING_B")){curstring >> varname >> ivalue; TAGGING_B = ivalue;}
     170    else if(strstr(temp_string.c_str(),"MISTAGGING_C")){curstring >> varname >> ivalue; MISTAGGING_C = ivalue;}
     171    else if(strstr(temp_string.c_str(),"MISTAGGING_L")){curstring >> varname >> ivalue; MISTAGGING_L = ivalue;}
    156172    else if(strstr(temp_string.c_str(),"CONERADIUS")){curstring >> varname >> value; CONERADIUS = value;}
    157     else if(strstr(temp_string.c_str(),"JETALGO")){curstring >> varname >> value; JETALGO = (int)value;}
    158     else if(strstr(temp_string.c_str(),"TRACKING_EFF")){curstring >> varname >> value; TRACKING_EFF = (int)value;}
     173    else if(strstr(temp_string.c_str(),"JETALGO")){curstring >> varname >> ivalue; JETALGO = ivalue;}
     174    else if(strstr(temp_string.c_str(),"TRACKING_EFF")){curstring >> varname >> ivalue; TRACKING_EFF = ivalue;}
    159175    else if(strstr(temp_string.c_str(),"ELEC_pt")){curstring >> varname >> value; ELEC_pt = value;}
    160176    else if(strstr(temp_string.c_str(),"MUON_pt")){curstring >> varname >> value; MUON_pt = value;}
    161177    else if(strstr(temp_string.c_str(),"JET_pt")){curstring >> varname >> value; JET_pt = value;}
    162178    else if(strstr(temp_string.c_str(),"TAUJET_pt")){curstring >> varname >> value; TAUJET_pt = value;}
     179    else if(strstr(temp_string.c_str(),"NTOWERS")){curstring >> varname >> ivalue; NTOWERS = ivalue;}
     180    else if(strstr(temp_string.c_str(),"TOWER_ETA_EDGES")){
     181        curstring >> varname;   for(unsigned int i=0; i<NTOWERS+1; i++) {curstring >> value; TOWER_ETA_EDGES[i] = value;} }
     182    else if(strstr(temp_string.c_str(),"TOWER_DPHI")){
     183        curstring >> varname;   for(unsigned int i=0; i<NTOWERS; i++) {curstring >> value; TOWER_DPHI[i] = value;} }
     184   
    163185
    164186  }
    … …  
    182204 PROTOJET_PTMIN = 0.0;
    183205
    184  DOTRIGGER=1;
    185206
    186207}
    187208
    188209void RESOLution::Logfile(string LogName) {
     210//void RESOLution::Logfile(string outputfilename) {
    189211
    190212  ofstream f_out(LogName.c_str());
    … …  
    266288        << left << setw(5) <<BFIELD_Z <<""<< right << setw(10)<<"*"<<"\n";
    267289  f_out<<"*                                                                    *"<<"\n";
     290
     291
     292  f_out<<"*                                                                    *"<<"\n";
     293  f_out<<"#********************                                                *"<<"\n";
     294  f_out<<"# Calorimetric Towers                                                *"<<"\n";
     295  f_out<<"#********************                                                *"<<"\n";
     296  f_out << left << setw(55) <<"* Number of calorimetric towers in eta, for eta>0: "<<""
     297        << left << setw(5) << NTOWERS <<""<< right << setw(10)<<"*"<<"\n";
     298  f_out << left << setw(55) <<"* Tower edges in eta, for eta>0: "<<"" << right << setw(15)<<"*"<<"\n";
     299          f_out << "*   ";
     300          for (unsigned int i=0; i<NTOWERS+1; i++) {
     301                f_out << left << setw(7) << TOWER_ETA_EDGES[i];
     302                if(!( (i+1) %9 )) f_out << right << setw(3) << "*" << "\n" << "*   ";
     303          }
     304          for (unsigned int i=(NTOWERS+1)%9; i<9; i++) f_out << left << setw(7) << "";
     305          f_out << right << setw(3)<<"*"<<"\n";
     306  f_out << left << setw(55) <<"* Tower sizes in phi, for eta>0 [degree]:"<<"" << right << setw(15)<<"*"<<"\n";
     307          f_out << "*   ";
     308          for (unsigned int i=0; i<NTOWERS; i++) {
     309                f_out << left << setw(7) << TOWER_DPHI[i];
     310                if(!( (i+1) %9 )) f_out << right << setw(3) << "*" << "\n" << "*   ";
     311          }
     312          for (unsigned int i=(NTOWERS)%9; i<9; i++) f_out << left << setw(7) << "";
     313          f_out << right << setw(3)<<"*"<<"\n";
     314  f_out<<"*                                                                    *"<<"\n";
     315
    268316  f_out<<"#************************************                                *"<<"\n";
    269317  f_out<<"# Electromagnetic smearing parameters                                *"<<"\n";
    … …  
    446494  float energy = electron.E();  // before smearing
    447495  float energyS = 0.0;          // after smearing  // \sigma/E = C + N/E + S/\sqrt{E}
    448   float eta=fabs(electron.Eta());
    449  
    450   if(eta < MAX_TRACKER) { // if the electron is inside the tracker
     496 
     497  if(fabs(electron.Eta()) < MAX_TRACKER) { // if the electron is inside the tracker
    451498    energyS = gRandom->Gaus(energy, sqrt(
    452499                                         pow(ELG_Ncen,2) +
    … …  
    454501                                         pow(ELG_Scen*sqrt(energy),2) ));
    455502  }
    456   if(eta > MAX_TRACKER && eta < MAX_CALO_FWD){
     503  if(fabs(electron.Eta()) > MAX_TRACKER && fabs(electron.Eta()) < MAX_CALO_FWD){
    457504    energyS = gRandom->Gaus(energy, sqrt(
    458505                                         pow(ELG_Nfwd,2) +
    … …  
    609656
    610657
     658  //********** returns a segmented value for eta and phi, for calo towers *****
     659void RESOLution::BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta){
     660   iEta = -100;
     661   int index=-100;
     662   for (unsigned int i=1; i< NTOWERS+1; i++) {
     663        if(fabs(eta)>TOWER_ETA_EDGES[i-1] && fabs(eta)<TOWER_ETA_EDGES[i]) {
     664                iEta = (eta>0) ? TOWER_ETA_EDGES[i-1] : -TOWER_ETA_EDGES[i];
     665                index = i-1;
     666                //cout << setw(15) << left << eta << "\t" << iEta << endl;
     667                break;
     668        }
     669   }
     670   if(index==-100) return;
     671   iPhi = -100;
     672   float dphi = TOWER_DPHI[index]*PI/180.;
     673   for (unsigned int i=1; i < 360/TOWER_DPHI[index]; i++ ) {
     674        float low = -PI+(i-1)*dphi;
     675        float high= low+dphi;
     676        if(phi > low && phi < high ){
     677                iPhi = low;
     678                break;
     679        }
     680   }
     681   if (phi > PI-dphi) iPhi = PI-dphi;
     682}
     683
     684
    611685//**************************** Returns the delta Phi ****************************
    612686float DeltaPhi(const float phi1, const float phi2) {
Note: See TracChangeset for help on using the changeset viewer.