Changeset 264 in svn for trunk

Timestamp:

Feb 11, 2009, 10:22:30 AM (16 years ago)

Author:

Xavier Rouby

Message:

first test 2.0

Location:

trunk

Files:

• Delphes.cpp (modified) (22 diffs)
• Examples/Trigger_Only.cpp (modified) (1 diff)
• Examples/src/Analysis_Ex.cc (modified) (2 diffs)
• README (modified) (1 diff)
• Resolutions.cpp (modified) (11 diffs)
• TODO (modified) (1 diff)
• Utilities/ExRootAnalysis/interface/BlockClasses.h (modified) (10 diffs)
• Utilities/ExRootAnalysis/src/BlockClasses.cc (modified) (4 diffs)
• Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h (modified) (3 diffs)
• Utilities/FROG/config.txt (modified) (1 diff)
• Utilities/Hector/src/H_AbstractBeamLine.cc (modified) (1 diff)
• VERSION (modified) (1 diff)
• data/DataCardDet.dat (modified) (5 diffs)
• data/DataCardDet_CMS.dat (modified) (2 diffs)
• data/trigger.dat (modified) (1 diff)
• interface/BFieldProp.h (modified) (1 diff)
• interface/CaloUtil.h (added)
• interface/D_Constants.h (added)
• interface/FrogUtil.h (modified) (1 diff)
• interface/SmearUtil.h (modified) (6 diffs)
• interface/TreeClasses.h (modified) (1 diff)
• interface/TriggerUtil.h (modified) (3 diffs)
• routines/plot_performances.C (modified) (1 diff)
• routines/resolutions.C (modified) (1 diff)
• src/BFieldProp.cc (modified) (6 diffs)
• src/CaloUtil.cc (added)
• src/D_Constants.cc (added)
• src/HEPEVTConverter.cc (modified) (1 diff)
• src/LHEFConverter.cc (modified) (1 diff)
• src/STDHEPConverter.cc (modified) (1 diff)
• src/SmearUtil.cc (modified) (18 diffs)
• src/TreeClasses.cc (modified) (1 diff)
• src/TreeClassesLinkDef.h (modified) (1 diff)
• src/TriggerUtil.cc (modified) (14 diffs)

trunk/Delphes.cpp

@@ -31 +31 @@
 
 /// \file Delphes.cpp
-/// \brief executable for the Delphes
+/// \brief Executable for Delphes
 
 #include "TChain.h"
@@ -41 +41 @@
 #include "ExRootTreeWriter.h"
 #include "ExRootTreeBranch.h"
+#include "ExRootProgressBar.h"
 
 #include "DataConverter.h"
@@ -48 +49 @@
 
 #include "SmearUtil.h"
+#include "CaloUtil.h"
 #include "BFieldProp.h"
 #include "TriggerUtil.h"
@@ -56 +58 @@
 #include <vector>
 #include <iostream>
-
-#include "Utilities/ExRootAnalysis/interface/ExRootProgressBar.h"
 
 using namespace std;
@@ -77 +77 @@
 int main(int argc, char *argv[])
 {
+unsigned int nnnn=0, mmmm=0;
+
   int appargc = 2;
   char *appName= new char[20];
@@ -86 +88 @@
   delete [] appName;
   delete [] appOpt;
-
 
   if(argc != 3 && argc != 4 && argc != 5) {
@@ -242 +243 @@
   //Propagation of tracks in the B field
   TrackPropagation *TRACP = new TrackPropagation(DET); 
-  //TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 
   
   //Jet information
   JetsUtil *JETRUN = new JetsUtil(DET);
-  //JetsUtil *JETRUN = new JetsUtil(DetDatacard);
   
   //VFD information
   VeryForward * VFD = new VeryForward(DET);
-  //VeryForward * VFD = new VeryForward(DetDatacard);
  
   // data converters
@@ -299 +297 @@
   ExRootTreeBranch *branchMuon = treeWriter->NewBranch("Muon", TRootMuon::Class());
   ExRootTreeBranch *branchPhoton = treeWriter->NewBranch("Photon", TRootPhoton::Class());
-  ExRootTreeBranch *branchTracks = treeWriter->NewBranch("Tracks", TRootTracks::Class());
+  //ExRootTreeBranch *branchTracks = treeWriter->NewBranch("Tracks", TRootTracks::Class());
+  ExRootTreeBranch *branchTrack = treeWriter->NewBranch("Tracks", D_Track::Class());
   ExRootTreeBranch *branchETmis = treeWriter->NewBranch("ETmis", TRootETmis::Class());
   ExRootTreeBranch *branchCalo = treeWriter->NewBranch("CaloTower", TRootCalo::Class());
@@ -306 +305 @@
   ExRootTreeBranch *branchFP420 = treeWriter->NewBranch("FP420hits", TRootRomanPotHits::Class());
   
-  TRootGenParticle *particle; 
   TRootETmis *elementEtmis;
   TRootElectron *elementElec;
   TRootMuon *elementMu;
   TRootPhoton *elementPhoton;
-  TRootTracks *elementTracks;
+  D_Track * elementTrack;
   TRootCalo *elementCalo;
   
@@ -323 +321 @@
   vector<TLorentzVector> TrackCentral;  
   vector<PhysicsTower> towers;
-  vector<ParticleUtil> electron;
-  vector<ParticleUtil> muon;
-  vector<ParticleUtil> gamma;
+  //vector<ParticleUtil> electron;
+  vector<D_Particle> electron;
+  //vector<ParticleUtil> muon;
+  vector<D_Particle> muon;
+  //vector<ParticleUtil> gamma;
+  vector<D_Particle> gamma;
 
   TSimpleArray<TRootGenParticle> NFCentralQ;
-  float iPhi=0,iEta=0;
-
+
+D_CaloList list_of_calorimeters;
+D_CaloElement CentralCalo("centralcalo", 
+        -DET->CEN_max_calo_cen, DET->CEN_max_calo_cen,
+         DET->ELG_Ccen,  DET->ELG_Ncen,  DET->ELG_Scen,
+         DET->HAD_Chcal, DET->HAD_Nhcal, DET->HAD_Shcal);
+D_CaloElement ForwardCalo("forwardcalo",
+         DET->CEN_max_calo_cen, DET->CEN_max_calo_fwd, 
+         DET->ELG_Cfwd,  DET->ELG_Nfwd,  DET->ELG_Sfwd,
+         DET->HAD_Chf,   DET->HAD_Nhf,   DET->HAD_Shf  );
+D_CaloElement BackwardCalo("backwardcalo",
+        -DET->CEN_max_calo_fwd, -DET->CEN_max_calo_cen,
+         DET->ELG_Cfwd,  DET->ELG_Nfwd,  DET->ELG_Sfwd,
+         DET->HAD_Chf,   DET->HAD_Nhf,   DET->HAD_Shf  );
+//D_CaloElement CastorCalo("castor",5.5,6.6,1,0,0,1,0,0);
+list_of_calorimeters.addElement(CentralCalo);
+list_of_calorimeters.addElement(ForwardCalo);
+list_of_calorimeters.addElement(BackwardCalo);
+//list_of_calorimeters.addElement(CastorCalo);
+list_of_calorimeters.sortElements();
 
 
@@ -360 +379 @@
       towers.clear();
       input_particles.clear();
-      
+
+
+/*
+if(0) { // OLD SMEARING ALGORITHM without energy flow
       // 2.1 Loop over all particles in event
       itGen.Reset();
       while( (particle = (TRootGenParticle*) itGen.Next()) ) {
           int pid = abs(particle->PID);
+          float iPhi=0,iEta=0;
 
         
@@ -381 +404 @@
           // the ordering of conditions have been optimised for speed : put first the STATUS condition
           if( (particle->Status == 1)    &&
-              ((pid != pNU1) && (pid != pNU2) && (pid != pNU3)) &&
+              (pid != pNU1) && (pid != pNU2) && (pid != pNU3) &&
               (fabs(particle->Eta) < DET->CEN_max_calo_fwd)
               ) 
@@ -431 +454 @@
               if(genMomentumBfield.E() !=0 && pid != pMU) {
                 // in case the Bfield is not simulated, checks that charged particles have enough pt to reach the calos
-                if ( !DET->FLAG_bfield && charge!=0 && genMomentumBfield.Pt() <= DET->TRACK_ptmin ) { /* particules do not reach calos */ }
+                if ( !DET->FLAG_bfield && charge!=0 && genMomentumBfield.Pt() <= DET->TRACK_ptmin ) {}// particules do not reach calos 
                 else { // particles reach calos 
                   // applies the calo segmentation and returns iEta & iPhi
                   DET->BinEtaPhi(genMomentumBfield.Phi(), genMomentumBfield.Eta(), iPhi, iEta); 
-                  if(iEta != -100 && iPhi != -100) { 
+                  if(iEta != UNDEFINED && iPhi != UNDEFINED) { 
                       momentumCaloSegmentation.SetPtEtaPhiE(genMomentumBfield.Pt(),iEta,iPhi,genMomentumBfield.E());
                       elementCalo = (TRootCalo*) branchCalo->NewEntry();
@@ -441 +464 @@
                       PhysicsTower Tower(LorentzVector(momentumCaloSegmentation.Px(),momentumCaloSegmentation.Py(),momentumCaloSegmentation.Pz(),momentumCaloSegmentation.E()));
                       towers.push_back(Tower);
-                  } // if iEta != -100
+                  } // if iEta != UNDEFINED
                 } // else : when particles reach the calos
               } // 2.1.2.3 calotowers
-              
+
 
               // 2.1.2.4 ********************* central detector: tracks
@@ -451 +474 @@
                  (genMomentumBfield.E()!=0) &&
                  (fabs(genMomentumBfield.Eta()) < DET->CEN_max_tracker) && 
-                 (DET->FLAG_bfield || ( !DET->FLAG_bfield && genMomentumBfield.Pt() > DET->TRACK_ptmin )) &&     
+                 (DET->FLAG_bfield || ( !DET->FLAG_bfield && genMomentum.Pt() > DET->TRACK_ptmin )) &&     
                         // if bfield not simulated, pt should be high enough to be taken into account
                  ((rand()%100) < DET->TRACK_eff)  &&
@@ -475 +498 @@
              VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
           }
-          
-       } // 2.1 while : loop on all particles of the event.
-     
+} // IF OLD ALGORITHM (= no energy flow )
+
+
+
+
+else // IF NEW ALGORITHM with energy flow              
+*/
+{
+      D_CaloTowerList list_of_active_towers; 
+      D_CaloTowerList list_of_towers_with_photon; // to speed up the code: will only look in interesting towers for gamma candidates
+
+      // 2.1a Loop over all particles in event, to fill the towers
+      itGen.Reset();
+      TRootGenParticle *particle; 
+      while( (particle = (TRootGenParticle*) itGen.Next()) ) {
+          int pid = abs(particle->PID);
+          particle->Charge=Charge(pid);
+          particle->setFractions(); // init
+
+
+          // 2.1a.1********************* preparation for the b-tagging
+          //// This subarray is needed for the B-jet algorithm
+          // optimization for speed : put first PID condition, then ETA condition, then either pt or status
+          if( (pid <= pB || pid == pGLUON) &&// is it a light quark or a gluon, i.e. is it one of these : u,d,c,s,b,g ?
+              fabs(particle->Eta) < DET->CEN_max_tracker &&
+              particle->Status != 1 &&
+              particle->PT > DET->PT_QUARKS_MIN ) {
+            NFCentralQ.Add(particle);
+          }
+
+          // 2.1a.2********************* visible particles only
+          if( (particle->Status == 1) && (pid != pNU1) && (pid != pNU2) && (pid != pNU3) ){
+
+            // 2.1a.2.1 Central solenoidal magnetic field 
+            TRACP->bfield(particle); // fills in particle->EtaCalo et particle->PhiCalo
+            particle->SetEtaPhi(particle->EtaCalo,particle->PhiCalo); // ???? check this line
+
+            // 2.1a.2.2 Filling the calorimetric towers -- includes also forward detectors ?
+            // first checks if the charged particles reach the calo!
+            if( DET->FLAG_bfield || 
+                particle->getCharge()==0 ||
+                (!DET->FLAG_bfield && particle->getCharge()!=0 && particle->PT > DET->TRACK_ptmin)) 
+            if(
+                (particle->EtaCalo > list_of_calorimeters.getEtamin() ) &&
+                (particle->EtaCalo < list_of_calorimeters.getEtamax() )
+              ) {
+                float iEta=UNDEFINED, iPhi=UNDEFINED;
+                DET->BinEtaPhi(particle->PhiCalo,particle->EtaCalo,iPhi,iEta); // fills in iPhi and iEta
+                if (iEta != UNDEFINED && iPhi != UNDEFINED) 
+                {
+                  D_CaloTower tower(iEta,iPhi);                                // new tower
+                  tower.Set_Eem_Ehad_E_ET(particle->E*particle->getFem() , particle->E*particle->getFhad() );
+                
+                  list_of_active_towers.addTower(tower);
+                  // this list may contain several times the same calotower, as several particles 
+                  // may leave some energy in the same calotower
+                  // After the loop on particles, identical cells in the list should be merged 
+                } // iEta and iPhi must be defined
+            }
+
+            // 2.1a.2.3 charged particles in tracker: energy flow
+            // if bfield not simulated, pt should be high enough to be taken into account
+            // it is supposed here that DET->MAX_calo > DET->CEN_max_tracker > DET->CEN_max_mu > 0
+            if( particle->getCharge() !=0 &&
+                fabs(particle->EtaCalo)< DET->CEN_max_tracker && // stays in the tracker -> track available
+               ( DET->FLAG_bfield || 
+                  (!DET->FLAG_bfield && particle->PT > DET->TRACK_ptmin)
+                )
+              ) {       
+                // 2.1a.2.3.1 Filling the particle properties + smearing
+                   // Hypothesis: the final eta/phi are the ones from the generator, thanks to the track reconstruction
+                   // This is the EnergyFlow hypothesis
+                   particle->SetEtaPhi(particle->Eta,particle->Phi);
+                   float sET=UNDEFINED; // smeared ET, computed from the smeared E -> needed for the tracks
+
+                   // 2.1a.2.3.2 Muons
+                   if (pid == pMU && fabs(particle->EtaCalo)< DET->CEN_max_mu && particle->PT > DET->PTCUT_muon ) {
+                        TLorentzVector p;
+                        float sPT = gRandom->Gaus(particle->PT, DET->MU_SmearPt*particle->PT );
+                        if (sPT > 0 && sPT > DET->PTCUT_muon) {
+                           p.SetPtEtaPhiE(sPT,particle->Eta,particle->Phi,sPT*cosh(particle->Eta));
+                           muon.push_back(D_Particle(p,pMU,particle->EtaCalo,particle->PhiCalo));
+                        }
+                        sET = (sPT >0)? sPT : 0;
+                   }  
+                   // 2.1a.2.3.3 Electrons
+                   else if (pid == pE) {
+                     // Finds in which calorimeter the particle has gone, to know its resolution
+
+                     D_CaloElement currentCalo = list_of_calorimeters.getElement(particle->EtaCalo);
+                     if(currentCalo.getName() == dummyCalo.getName()) {
+                        cout << "** Warning: the calo coverage behind the tracker is not complete! **" << endl; }
+
+                     // final smeared EM energy   // electromagnetic fraction F_em =1 for electrons;
+                     float sE  = currentCalo.getElectromagneticResolution().Smear(particle->E);
+                     if (sE>0) {
+                       sET = sE/cosh(particle->Eta); 
+                       // NB: ET is found via the calorimetry and not via the track curvature
+
+                       TLorentzVector p;
+                       p.SetPtEtaPhiE(sET,particle->Eta,particle->Phi,sE);
+                       if (sET > DET->PTCUT_elec)
+                         electron.push_back(D_Particle(p,particle->PID,particle->EtaCalo,particle->PhiCalo));
+                     } else { sET=0;} // if negative smeared energy -- needed for the tracks
+                   }  
+                   // 2.1a.2.3.4 Other charged particles : smear them for the tracks!
+                   else {  //other particles
+                        D_CaloElement currentCalo = list_of_calorimeters.getElement(particle->EtaCalo);
+                        float sEem  = currentCalo.getElectromagneticResolution().Smear(particle->E * particle->getFem());
+                        float sEhad = currentCalo.getHadronicResolution().Smear(particle->E * particle->getFhad());
+                        float sE = ( (sEem>0)? sEem : 0 ) + ( (sEhad>0)? sEhad : 0 );
+                        sET = sE/cosh(particle->EtaCalo);
+                   }
+
+                   // 2.1a.2.3.5 Tracks
+                   if( (rand()%100) < DET->TRACK_eff && sET!=0) {
+                     elementTrack = (D_Track*) branchTrack->NewEntry();
+                     elementTrack->Set(particle->Eta, particle->Phi, particle->EtaCalo, particle->PhiCalo, sET);
+                     TrackCentral.push_back(elementTrack->GetFourVector()); // tracks at vertex!
+                     // TODO!!! associates the tracks to the calo where it points to
+                     // TODO!!! apply a smearing on the position of the origin of the track
+                     // TODO!!! elementTracks->SetPositionOut(Xout,Yout,Zout);
+                   }
+            } // 2.1a.2.3 : if tracker/energy-flow
+            // 2.1a.2.4 Photons
+               // stays in the tracker -> track available -> gamma ID
+            else if( (pid == pGAMMA) && fabs(particle->EtaCalo)< DET->CEN_max_tracker ) {
+                float iEta=UNDEFINED, iPhi=UNDEFINED;
+                DET->BinEtaPhi(particle->PhiCalo,particle->EtaCalo,iPhi,iEta); // fills in iPhi and iEta
+                D_CaloTower tower(iEta,iPhi); 
+                // stores the list of towers where to apply the photon ID algorithm. Just a trick for a faster search
+                list_of_towers_with_photon.addTower(tower); 
+            }
+            // 2.1a.2.5 : very forward detectors
+            else if (DET->FLAG_vfd==1) {
+                // for the moment, only protons are transported
+                // BUT !!! could be a beam of other particles! (heavy ions?)
+                // BUT ALSO !!! if very forward muons, or others!
+              VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
+              VFD->ZDC(treeWriter,branchZDC,particle);
+            }
+            // 2.1a.2.6: Zero degree calorimeter
+            //else if(DET->FLAG_zdc==1) {
+              //VFD->ZDC(treeWriter,branchZDC,particle);
+            //}
+
+          } // 2.1a.2 : if visible particle
+      } // loop on all particles 2.1a
+        
+
+      // 2.1b loop on all (activated) towers
+      // at this stage, list_of_active_towers may contain several times the same tower
+      // first step is to merge identical towers, by matching their (iEta,iPhi)  
+      list_of_active_towers.mergeDuplicates();
+      // Calotower smearing 
+      list_of_active_towers.smearTowers(list_of_calorimeters);
+
+      for(unsigned int i=0; i<list_of_active_towers.size(); i++) {
+        float iEta = list_of_active_towers[i].getEta();
+        float iPhi = list_of_active_towers[i].getPhi();
+        float e = list_of_active_towers[i].getE(); 
+        if(iEta != UNDEFINED && iPhi != UNDEFINED && e!=0) {
+           elementCalo = (TRootCalo*) branchCalo->NewEntry();
+           elementCalo->set(list_of_active_towers[i]);
+           // not beautiful : should be improved!
+           TLorentzVector p;
+           p.SetPtEtaPhiE(list_of_active_towers[i].getET(), iEta, iPhi, e );
+           PhysicsTower Tower(LorentzVector(p.Px(),p.Py(),p.Pz(),p.E()));
+           towers.push_back(Tower);
+        }
+      } // loop on towers
+
+      // 2.1c photon ID
+      // list_of_towers_with_photon is the list of towers with photon candidates
+      // already smeared !
+      // sorts the vector and smears duplicates 
+      list_of_towers_with_photon.mergeDuplicates(); 
+
+      for(unsigned int i=0; i<list_of_towers_with_photon.size(); i++) {
+          float eta = list_of_towers_with_photon[i].getEta(); 
+          float phi = list_of_towers_with_photon[i].getPhi();
+          D_CaloTower cal(list_of_active_towers.getElement(eta,phi));
+          if(cal.getEta() != UNDEFINED && cal.getPhi() != UNDEFINED &&  cal.getE() > 0) {
+            TLorentzVector p;
+            p.SetPtEtaPhiE(cal.getET(), eta,phi,cal.getE() );
+            if (cal.getET() > DET->PTCUT_gamma) { gamma.push_back(D_Particle(p,pGAMMA,p.Eta(),p.Phi())); }
+          }
+      } // for -- list of photons
+
+}  // IF NEW ALGORITHM with energy flow
+
+
 
 
       // 2.2 ********** Output preparation & complex objects  ***********
- 
       // 2.2.1 ********************* sorting collections by decreasing pt
       DET->SortedVector(electron); 
@@ -487 +698 @@
         elementElec = (TRootElectron*) branchElectron->NewEntry();
         elementElec->Set(electron[i].Px(),electron[i].Py(),electron[i].Pz(),electron[i].E());
+        elementElec->EtaCalo = electron[i].EtaCalo(); 
+        elementElec->PhiCalo = electron[i].PhiCalo();
         elementElec->Charge = sign(electron[i].PID());
         elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,2.0);//isolation based on tracks
@@ -495 +708 @@
         elementMu->Charge = sign(muon[i].PID());
         elementMu->Set(muon[i].Px(),muon[i].Py(),muon[i].Pz(),muon[i].E());
+        elementMu->EtaCalo = muon[i].EtaCalo(); 
+        elementMu->PhiCalo = muon[i].PhiCalo();
         elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,2.0);
       }
@@ -501 +716 @@
         elementPhoton = (TRootPhoton*) branchPhoton->NewEntry();
         elementPhoton->Set(gamma[i].Px(),gamma[i].Py(),gamma[i].Pz(),gamma[i].E());
+        elementPhoton->EtaCalo = gamma[i].EtaCalo();
+        elementPhoton->PhiCalo = gamma[i].PhiCalo();
       }
       
@@ -522 +739 @@
       elementEtmis->Py = (-PTmis).Py();
       
-      // 2.2.3 ************* B-tag, tau jets
+      // 2.2.3 ************* jets, B-tag, tau jets
       sorted_jets=JETRUN->RunJets(input_particles);
       JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ);
@@ -529 +746 @@
       treeWriter->Fill();
     } // 2. Loop over all events ('for' loop)
- 
+
+
   cout <<"**                                                                 **"<< endl;
   cout <<"**                 Exiting detector simulation...                  **"<< endl;
@@ -649 +867 @@
   delete treeReader;
   delete DET;
-//  delete TRIGT;
+  delete TRIGT;
   delete TRACP;
   delete JETRUN;

trunk/Examples/Trigger_Only.cpp

@@ -94 +94 @@
 
   //read the datacard input file
-  string TrigDatacard("");
+  string TrigDatacard("data/trigger.dat");
   if(argc==3)  TrigDatacard =argv[2];
 

trunk/Examples/src/Analysis_Ex.cc

@@ -155 +155 @@
           D1       = gen->D1;       // particle 1st daughter 
           D2       = gen->D2;       // particle 2nd daughter 
-          Charge = gen->Charge;   // electrical charge
+          Charge = gen->getCharge();   // electrical charge
           
           T      = gen->T;        // particle vertex position (t component)
@@ -334 +334 @@
      for(Int_t i=0;i < numElec; i++)Lept[i].SetPxPyPzE(el[i]->Px,el[i]->Py,el[i]->Pz,el[i]->E);
      for(Int_t k = numElec; k < (numElec+mu.GetEntries()); k++)Lept[k].SetPxPyPzE(mu[k-numElec]->Px,mu[k-numElec]->Py,mu[k-numElec]->Pz,mu[k-numElec]->E);
-    
+    cout<<"normalement il y a quelque chose... "<<endl;
      //Example how to white a branch in the output file
      inv_mass=(TRootInvm*) INVMASS->NewEntry();

trunk/README

@@ -104 +104 @@
  - dans ParticleUtil
         eta,phi et eta_calo,phi_calo
+ - TRootParticle::SetEtaPhiEET : pas fini
 

trunk/Resolutions.cpp

@@ -1 @@
-/***********************************************************************
-**                                                                    **
-**          /----------------------------------------------\          **
-**         |  Delphes, a framework for the fast simulation  |         **
-**         |       of a  generic collider experiment        |         **
-**          \----------------------------------------------/          **
-**                                                                    **
-**                                                                    **
-**   This package uses:                                               **
-**   ------------------                                               **
-**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
-**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
-**   FROG: [hep-ex/0901.2718v1]                                       **
-**                                                                    **
-** ------------------------------------------------------------------ **
-**                                                                    **
-**   Main authors:                                                    **
-**   -------------                                                    **
-**                                                                    **
-**                Severine Ovyn                Xavier Rouby           ** 
-**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
-**                                                                    ** 
-**         Center for Particle Physics and Phenomenology (CP3)        ** 
-**                Universite catholique de Louvain (UCL)              **       
-**                     Louvain-la-Neuve, Belgium                      **            
-**                                                                    **
-**                      Copyright (C) 2008-2009,                      **
-**                        All rights reserved.                        **  
-**                                                                    **
-***********************************************************************/
+/*
+  ---- FastSim ----
+  A Fast Simulator for general purpose LHC detector
+  S. Ovyn ~~~~ severine.ovyn@uclouvain.be
+
+  Center for Particle Physics and Phenomenology (CP3)
+  Universite Catholique de Louvain (UCL)
+  Louvain-la-Neuve, Belgium
+*/
+
+/// \file Smearing.cpp
+/// \brief executable for the FastSim
 
 #include "TChain.h"
@@ -47 +29 @@
 #include "JetsUtil.h"
 #include "BFieldProp.h"
+
+//#include "PseudoJet.hh"
+//#include "ClusterSequence.hh"
 
 #include<vector>
@@ -75 +60 @@
        if(abs(gen1->PID)==15)
          {
-cout<<"au moins on a un tau "<<endl;
             int d1=gen1->D1;
             int d2=gen1->D2;
-cout<<"il a des filles? "<<endl;
             if((d1 < array.GetEntries()) && (d1 > 0) && (d2 < array.GetEntries()) && (d2 > 0))
                {
                  tauhad=true;
                  for(int d=d1; d < d2+1; d++)
-                    {cout<<abs(array[d]->PID)<<"  "<<endl;
+                    {
                       if(abs(array[d]->PID)== pE || abs(array[d]->PID)== pMU)tauhad=false;
                     }
@@ -115 +98 @@
    {
       TLorentzVector Att;
-      Att.SetPxPyPzE(jet->Px,jet->Py,jet->Pz,jet->E);
+      Att.SetPtEtaPhiE(jet->PT,jet->Eta,jet->Phi,jet->E);
       if(DeltaR(JET.Phi(),JET.Eta(),Att.Phi(),Att.Eta()) < deltaRtest)
         {
@@ -137 +120 @@
    {
       TLorentzVector Att;
-      Att.SetPxPyPzE(elec->Px,elec->Py,elec->Pz,elec->E);
+      Att.SetPtEtaPhiE(elec->PT,elec->Eta,elec->Phi,elec->E);
       if(DeltaR(ELEC.Phi(),ELEC.Eta(),Att.Phi(),Att.Eta()) < deltaRtest)
         {
@@ -313 +296 @@
                  case pE: // all electrons with eta < DET->MAX_CALO_FWD
                     PairingElec(recoMomentum,genMomentum,branchElec);
-                    if(recoMomentum.Pt()>1){
+                    if(recoMomentum.E()!=0){
                      elementElec=(RESOLELEC*) branchelec->NewEntry();
                      elementElec->E = genMomentum.E();
@@ -331 +314 @@
 
         } // while
-      
+     
       //compute missing transverse energy from calo towers    
       TIter itCalo((TCollection*)branchTowers);
@@ -340 +323 @@
       while( (calo = (TRootCalo*) itCalo.Next()) )
            {
-          //Att.SetPxPyPzE(towers[i].fourVector.px, towers[i].fourVector.py, towers[i].fourVector.pz, towers[i].fourVector.E);
-          Att.SetPtEtaPhiE(calo->PT,calo->Eta,calo->Phi,calo->E);
-          towers.push_back(Att);
-          if(fabs(Att.Eta()) < DET->CEN_max_calo_fwd)
-            {
-               ScalarEt = ScalarEt + Att.Et();
-               PTmisReco = PTmisReco + Att;
-            }
-        }
-      
+             if(calo->E !=0){
+             Att.SetPtEtaPhiE(calo->getET(),calo->Eta,calo->Phi,calo->E);
+             towers.push_back(Att);
+             if(fabs(Att.Eta()) < DET->CEN_max_calo_fwd)
+               {
+                  ScalarEt = ScalarEt + calo->getET();
+                  PTmisReco = PTmisReco + Att;
+               }
+           }  
+      }
       elementEtmis= (ETMIS*) branchetmis->NewEntry();
       elementEtmis->Et = (PTmisGEN).Pt();
@@ -363 +346 @@
 
       TSimpleArray<TRootGenParticle> TausHadr = TauHadr(branchGen);
-cout<<"nombre de tau-jets "<<TausHadr.GetEntries()<<endl;
 
       TLorentzVector JETreco(0,0,0,0);
@@ -397 +379 @@
                     if( (EnergySmallCone(towers,JETT.Eta(),JETT.Phi(),DET->TAU_energy_scone,DET->JET_seed)/JETT.E()) > 0.95 
                      &&  (NumTracks(branchTracks,DET->TAU_track_pt,JETT.Eta(),JETT.Phi(),DET->TAU_track_scone))==1)numTauRec++;
-                    
                  }
               }
@@ -404 +385 @@
         
       } // for itJet : loop on all jets
+//cout<<"i"<<endl;
       
       treeWriter->Fill();
     } // Loop over all events
   treeWriter->Write();
-  float frac = numTauRec/numTau;  
-  cout<<numTauRec<<endl;
-  cout<<numTau<<endl;
+float frac = numTauRec/numTau;  
+cout<<numTauRec<<endl;
+cout<<numTau<<endl;
 
   cout << "** Exiting..." << endl;

trunk/TODO

@@ -18 +18 @@
  - copy constructors des classes ; passage par reference ; gprof tool <-> option -gp
  - valgrind <-> -g <-> definitely lost / probably lost
- - include .cpp de frog???
+ - pourquoi doit-on inclure les fichiers.cpp de frog???
  - TreeClassesLinkDef ???
+ - libHector.so = libUtilities.so !!!!!
+ - FLAG_zdc <-> pas complet, notamment dans le fichier log

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -13 +13 @@
  *  present in the data members of the Block TRoot class.
  *
- *  $Date: 2009-02-02 11:32:12 $
- *  $Revision: 1.11 $
+ *  $Date: 2009-02-11 09:19:14 $
+ *  $Revision: 1.12 $
  *
  *  
@@ -24 +24 @@
 #include "TObject.h"
 #include "BlockCompare.h"
+#include "interface/D_Constants.h"
+#include "interface/CaloUtil.h"
 
 class TSortableObject: public TObject
@@ -147 +149 @@
   float Pz; // particle momentum vector (z component) in GeV
 
-  float PT; // particle transverse momentum in GeV
   float Eta; // particle pseudorapidity  
   float Phi; // particle azimuthal angle in rad 
 
+  float EtaCalo; // particle pseudorapidity when entering the calo, 
+  float PhiCalo; // particle azimuthal angle in rad when entering the calo
+
   void Set(const TLorentzVector& momentum);
   void Set(const float px, const float py, const float pz, const float e);
-  static TCompare *fgCompare; //!
-  const TCompare *GetCompare() const { return fgCompare; }
+  void SetEtaPhi(const float eta, const float phi) {Eta=eta; Phi=phi;};
+  void SetEtaPhiCalo(const float eta, const float phi) {EtaCalo=eta; PhiCalo=phi;};
+  void SetEtaPhiEET(const float eta, const float phi, const float e, const float et);
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
+  //void SetEem_Ehad(const float sE_em, const float sE_had) {} ; // sets E_em and E_had, computes E and ET
+  float PT; // particle transverse momentum in GeV
+  //const float getEtaGen() const {return _EtaGen;}
+  //const float getPhiGen() const {return _PhiGen;}
+
+
+//protected:
+  //float EGen, _EtaGen, _PhiGen; // from the generator: energy, eta, phi
 
   ClassDef(TRootParticle, 1)
@@ -165 +180 @@
 
 public:
-  TRootGenParticle() {};
+  TRootGenParticle() {_initialised=false;}
   int PID; // particle HEP ID number [RawHepEventParticle::pid()]
   int Status; // particle status [RawHepEventParticle::status()]
@@ -172 +187 @@
   int D1; // particle 1st daughter [RawHepEventParticle::daughter1() - 1]
   int D2; // particle 2nd daughter [RawHepEventParticle::daughter2() - 1]
-  float Charge; // electrical charge
 
   float T; // particle vertex position (t component) [RawHepEventParticle::t()]
@@ -179 +193 @@
   float Z; // particle vertex position (z component) [RawHepEventParticle::z()]
   float M;
-  static TCompare *fgCompare; //!
-
+  void setFractions();
+  const float getCharge() const {return Charge;};
+  const float getFem()  {if(!_initialised) setFractions(); return _Fem;}
+  const float getFhad() {if(!_initialised) setFractions(); return _Fhad;}
+
+  float Charge;      // electrical charge
+
+  static TCompare *fgCompare; //!
+ protected:
+  float _Fem, _Fhad; // fractions of energy deposit
+  bool _initialised;
   ClassDef(TRootGenParticle, 1)
 };
+
 
 //------------------------------------------------------------------------------
@@ -225 +249 @@
 //---------------------------------------------------------------------------
 
-class TRootTracks: public TRootParticle
-{
-public:
-  TRootTracks() : Etaout(0), Phiout(0) {};
-  static TCompare *fgCompare; //!
- 
+class D_Track : public TSortableObject {
+//class D_Track : public TRootParticle {
+ public:
+    D_Track(); // needed for storage in ExRootAnalysis
+    D_Track(const D_Track& track);
+    D_Track(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt);
+    D_Track& operator=(const D_Track& track);
+    void Set(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt);
+    const TLorentzVector GetFourVector() const;
+    const float getEta() const {return Eta;}
+    const float getPhi() const {return Phi;}
+    const float getEtaOuter() const {return EtaOuter;}
+    const float getPhiOuter() const {return PhiOuter;}
+    const float getE() const {return E;}
+    const float getPx() const {return Px;}
+    const float getPy() const {return Py;}
+    const float getPz() const {return Pz;}
+    const float getPT() const {return PT;}
+
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
+ protected:
+    float Eta, Phi; // (eta,phi) at the beginning of the track
+    float EtaOuter, PhiOuter; // (eta,phi) at the end of the track
+    float PT, E, Px, Py, Pz;  // transverse momentum
+ ClassDef(D_Track, 1)
+};
+
+
+class TRootTracks: public TRootParticle  {
+public:
+  TRootTracks() {} // : Etaout(0), Phiout(0) {};
+  static TCompare *fgCompare; //!
+  TRootTracks(const D_Track& track);
+  float E;  // particle energy in GeV
+  float Px; // particle momentum vector (x component) in GeV
+  float Py; // particle momentum vector (y component) in GeV
+  float Pz; // particle momentum vector (z component) in GeV
+
+  float Eta; // particle pseudorapidity
+  float Phi; // particle azimuthal angle in rad
+
+  float EtaCalo; // particle pseudorapidity when entering the calo,
+  float PhiCalo; // particle azimuthal angle in rad when entering the calo 
 //  float X, Y, Z; // coordinates of the beginning of the track
 //  float Xout, Yout, Zout; // coordinates of the end of the track
-  float Etaout, Phiout; // coordinates of the end of the track
+  //float Etaout, Phiout; // coordinates of the end of the track
 //  void SetPosition(const float x, const float y, const float z) {X=x; Y=y; Z=z;}
 //  void SetPositionOut(const float x, const float y, const float z) {Xout=x; Yout=y; Zout=z;}
@@ -241 +303 @@
 //---------------------------------------------------------------------------
 
-class TRootCalo: public TRootParticle
-{
+/*class TRootCalo: public TRootParticle
 public:
   TRootCalo() {};
@@ -248 +309 @@
 
   ClassDef(TRootCalo, 1)
+};
+*/
+
+//class TRootCalo: public TSortableObject {
+class TRootCalo: public TRootParticle {
+ public:
+   TRootCalo() ;
+   TRootCalo(const TRootCalo& cal);
+   TRootCalo& operator=(const TRootCalo& cal);
+   void set(const D_CaloTower&  cal);
+   static TCompare *fgCompare; //!
+ //  const TCompare *GetCompare() const { return fgCompare; }
+   const float getET() const {return ET;}
+ 
+ protected:
+    //float Eta, Phi;    // segmented eta, phi
+    float E_em, E_had; // electromagnetic and hadronic components of the tower energy
+    //float E;
+    float ET;       // total energy and transverse energy   
+   ClassDef(TRootCalo, 1)
 };
 
@@ -340 +421 @@
 };
 
-//---------------------------------------------------------------------------
-
 #endif // BLOCKCLASSES_H
 

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -11 +11 @@
  *  to preserve mother-dautherlinks between particles.
  *
- *  $Date: 2009-02-02 11:32:01 $
- *  $Revision: 1.7 $
+ *  $Date: 2009-02-11 09:19:14 $
+ *  $Revision: 1.8 $
  *
  *  
@@ -22 +22 @@
 #include "BlockCompare.h"
 #include "TLorentzVector.h"
+#include <cmath>
 
 TCompare *TRootGenParticle::fgCompare = 0;
@@ -38 +39 @@
 TCompare *TRootRomanPotHits::fgCompare =0;
 TCompare *TRootTrigger::fgCompare =0;
+//TCompare *D_CaloTower::fgCompare=0;
+TCompare *D_Track::fgCompare=0;
 
 void TRootParticle::Set(const TLorentzVector& momentum) {
@@ -61 +64 @@
 }
 
+void TRootParticle::SetEtaPhiEET(const float eta, const float phi, const float e, const float et) {
+   Eta = eta; Phi = phi; E = e; PT = et;
+   //float theta = 2* atan(exp(-Eta);
+   Px = PT*cos(Phi);
+   Py = PT*sin(Phi);
+}
 
+
+void TRootGenParticle::setFractions() {
+  switch(abs(PID)) {
+    default:  _Fem = 0; _Fhad=1; break;
+    case(pE):
+    case(pGAMMA):
+    case(pPI0):
+        _Fem = 1; _Fhad=0; break;
+    case(pNU1):
+    case(pNU2):
+    case(pNU3):
+    case(pMU):
+        _Fem =0; _Fhad=0; break;
+    case(pK0S):
+    case(pLAMBDA):
+        _Fem=0.3; _Fhad=0.7; break;
+  }
+  _initialised=true;
+}
+
+    float Eta, Phi; // (eta,phi) at the beginning of the track
+    float EtaOuter, PhiOuter; // (eta,phi) at the end of the track
+    float PT, E, Px, Py, Pz; 
+
+D_Track::D_Track() :
+        Eta(UNDEFINED), Phi(UNDEFINED), EtaOuter(UNDEFINED), PhiOuter(UNDEFINED), 
+        PT(UNDEFINED), E(UNDEFINED), Px(UNDEFINED), Py(UNDEFINED), Pz(UNDEFINED) {}
+
+D_Track::D_Track(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) :
+        Eta(inEta), Phi(inPhi), EtaOuter(outEta), PhiOuter(outPhi), 
+        PT(pt) {
+        TLorentzVector p; p.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
+        Px = p.Px(); Py = p.Py(); Pz = p.Pz();  E=p.E();
+}
+
+D_Track::D_Track(const D_Track& track) :
+        Eta(track.Eta), Phi(track.Phi), 
+        EtaOuter(track.EtaOuter), PhiOuter(track.PhiOuter), 
+        PT(track.PT), E(track.E), Px(track.Px), Py(track.Py), Pz(track.Pz) {}
+
+D_Track& D_Track::operator=(const D_Track& track) {
+  if(this == &track) return *this;
+        Eta = track.Eta;             Phi = track.Phi; 
+        EtaOuter = track.EtaOuter;   PhiOuter = track.PhiOuter; 
+        PT = track.PT; E = track.E;  Px = track.Px;  Py= track.Py; Pz =track.Pz; 
+  return *this;
+}
+
+void D_Track::Set(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) {
+        Eta= inEta; Phi=inPhi;  EtaOuter=outEta; PhiOuter=outPhi; PT=pt; 
+        TLorentzVector p; p.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
+        Px = p.Px(); Py = p.Py(); Pz = p.Pz();  E=p.E();
+}
+
+const TLorentzVector D_Track::GetFourVector() const {
+        TLorentzVector v;
+        v.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
+        return TLorentzVector(v);
+}
+
+TRootCalo::TRootCalo() :
+        E_em(UNDEFINED), E_had(UNDEFINED), ET(UNDEFINED) {}
+        //Eta(UNDEFINED), Phi(UNDEFINED), E_em(UNDEFINED), E_had(UNDEFINED), E(UNDEFINED), ET(UNDEFINED) {}
+
+TRootCalo::TRootCalo(const TRootCalo& cal) {
+        E_em=cal.E_em; E_had=cal.E_had;  ET=cal.ET;
+        //Eta =cal.Eta;  Phi=cal.Phi; E_em=cal.E_em; E_had=cal.E_had;  E=cal.E;   ET=cal.ET;
+}
+
+TRootCalo& TRootCalo::operator=(const TRootCalo& cal) {
+   if(this==&cal) return *this;
+        Eta =cal.Eta;  Phi=cal.Phi; E_em=cal.E_em; E_had=cal.E_had;  E=cal.E;   ET=cal.ET;
+   return *this;
+}
+
+void TRootCalo::set(const D_CaloTower& cal) {
+        Eta =cal.getEta(); Phi=cal.getPhi(); 
+        E_em=cal.getEem(); E_had=cal.getEhad();
+        E   =cal.getE();   ET   =cal.getET();
+        EtaCalo = cal.getEta();
+        PhiCalo = cal.getPhi();
+}
+
+
+TRootTracks::TRootTracks(const D_Track& track) :
+   E(track.getE()), Px(track.getPx()), Py(track.getPy()), Pz(track.getPz()),
+   Eta(track.getEta()), Phi(track.getPhi()),
+   /*Etaout(track.getEtaOuter()),*/ EtaCalo(track.getEtaOuter()), /*Phiout(track.getPhiOuter()),*/ PhiCalo(track.getPhiOuter()) {}
+

trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h

@@ -4 +4 @@
  *  Lists classes to be included in cint dicitonary
  *
- *  $Date: 2008-12-02 11:14:45 $
- *  $Revision: 1.2 $
+ *  $Date: 2009-02-11 09:19:14 $
+ *  $Revision: 1.3 $
  *
  *  
@@ -13 +13 @@
 
 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
+#include "interface/D_Constants.h"
 
 #ifdef __CINT__
@@ -39 +40 @@
 #pragma link C++ class TRootLHEFEvent+;
 #pragma link C++ class TRootLHEFParticle+;
+#pragma link C++ class D_Track+;
+//#pragma link C++ class D_CaloTower+;
 
 

trunk/Utilities/FROG/config.txt

@@ -3 +3 @@
 InputVisFile ={../../DelphesToFrog.vis};
 
-GeomToDisplay = {910000000,920000000,930000000,940000000};
+//GeomToDisplay = {910000000,920000000,930000000,940000000};
 EventToDisplay = {21000000};
 

trunk/Utilities/Hector/src/H_AbstractBeamLine.cc

@@ -485 +485 @@
         /// @param offset In meters
 
-        extern int relative_energy;
+        extern bool relative_energy;
         if(!relative_energy) {
                 vector<H_OpticalElement*>::iterator element_i;

trunk/VERSION

@@ -1 @@
-1.4beta
+x.y

trunk/data/DataCardDet.dat

@@ -11 +11 @@
 ELG_Scen          0.05              // S term for central ECAL
 ELG_Ncen          0.25              // N term for central ECAL
-ELG_Ccen          0.005             // C term for central ECAL
-ELG_Sfwd          2.084             // S term for FCAL
-ELG_Nfwd          0.0               // N term for FCAL
-ELG_Cfwd          0.107             // C term for FCAL
+ELG_Ccen          0.005              // C term for central ECAL
+ELG_Cfwd          0.107             // S term for forward ECAL
+ELG_Sfwd          2.084             // C term for forward ECAL
+ELG_Nfwd          0.0               // N term for central ECAL
 
 # Energy resolution for hadrons in ecal/hcal/hf
 # \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-HAD_Shcal         1.5               // S term for central HCAL 
+HAD_Shcal         1.5               // S term for central HCAL // hadronic calorimeter
 HAD_Nhcal         0.                // N term for central HCAL
 HAD_Chcal         0.05              // C term for central HCAL
-HAD_Shf           2.7               // S term for FCAL
-HAD_Nhf           0.                // N term for FCAL
-HAD_Chf           0.13              // C term for FCAL
+HAD_Shf           2.7               // S term for HF // forward calorimeter
+HAD_Nhf           0.                // N term for HF
+HAD_Chf           0.13              // C term for HF
 
 # Muon smearing
@@ -29 +29 @@
 
 # Tracking efficiencies
-TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
+TRACK_ptmin       0.0               // minimal pt needed to reach the calorimeter in GeV
 TRACK_eff         100               // efficiency associated to the tracking (%)
 
@@ -48 +48 @@
 
 # Thresholds for reconstructed objetcs, Pt in GeV
-PTCUT_elec       10.0
-PTCUT_muon       10.0
-PTCUT_jet        20.0
-PTCUT_gamma      10.0
-PTCUT_taujet     10.0
+PTCUT_elec       0.0
+PTCUT_muon       0.0
+PTCUT_jet        0.0
+PTCUT_gamma      0.0
+PTCUT_taujet     0.0
 
 # General jet variable
@@ -65 +65 @@
 
 # FLAGS
-FLAG_bfield      1                       //1 to run the bfield propagation else 0
+FLAG_bfield      0                       //1 to run the bfield propagation else 0
 FLAG_vfd         1                       //1 to run the very forward detectors else 0
 FLAG_trigger     1                       //1 to run the trigger selection else 0
@@ -88 +88 @@
 RP_420_s          420                   // distance of the RP to the IP, in meters
 RP_420_x          0.004                 // distance of the RP to the beam, in meters
-RP_beam1Card      data/LHCB1IR5_v6.500.tfs
-RP_beam2Card      data/LHCB2IR5_v6.500.tfs
-RP_IP_name        IP5
-
 
 # In case FROG event display allowed

trunk/data/DataCardDet_CMS.dat

@@ -29 +29 @@
 
 # Tracking efficiencies
-TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
+TRACK_ptmin       0.0               // minimal pt needed to reach the calorimeter in GeV
 TRACK_eff         100               // efficiency associated to the tracking (%)
 
@@ -67 +67 @@
 FLAG_bfield      1                       //1 to run the bfield propagation else 0
 FLAG_vfd         1                       //1 to run the very forward detectors else 0
-FLAG_trigger     1                       //1 to run the trigger selection else 0
-FLAG_frog        1                       //1 to run the FROG event display
+FLAG_trigger     0                       //1 to run the trigger selection else 0
+FLAG_frog        0                       //1 to run the FROG event display
 
 # In case BField propagation allowed

trunk/data/trigger.dat

@@ -1 @@
-TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
+#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
 
 

trunk/interface/BFieldProp.h

@@ -53 +53 @@
 
     // Propagation and bfield are very similar. At the end, after code cleaning,
-    // onle bfield will remain in this class 
+    // only bfield will remain in this class 
     void Propagation(const TRootGenParticle *Part,TLorentzVector &genMomentum);
-    void bfield(const TRootGenParticle *Part, float& etacalo, float& phicalo);
+    void bfield(TRootGenParticle *Part); // fills in Part->EtaCalo and Part->PhiCalo
 
 

trunk/interface/FrogUtil.h

@@ -34 +34 @@
 
 
+/// \file FrogUtil.h
+/// \brief FrogDisplay class
+
 #include "SmearUtil.h"
 #include "FROG_Events.h"

trunk/interface/SmearUtil.h

@@ -40 +40 @@
 #include "TLorentzVector.h"
 
+#include "D_Constants.h"
+#include "CaloUtil.h"
 #include "BlockClasses.h"
 #include "TSimpleArray.h"
@@ -46 +48 @@
 using namespace std;
 
-class ParticleUtil {
+class D_Particle {
 
  public:
-  ParticleUtil(const TLorentzVector &genMomentum, int pid);
-
-  float E() {return _e;}    // particle energy [GeV]
-  float Px() {return _px;}  // horizontal coordinate of momentum [GeV]
-  float Py() {return _py;}  // vertical coordinate of momentum [GeV]
-  float Pz() {return _pz;}  // longitudinal coordinate of momentum [GeV]
-  float Pt() {return _pt;}  // transverse momentum [GeV]
-  float EtaCalo() {return _etaCalo;}  // pseudorapidity 
-  float Eta() {return _eta;}  // pseudorapidity 
-  float PhiCalo() {return _phiCalo;}  // azimuthal angle 
-  float Phi() {return _phi;}  // azimuthal angle 
-  int PID() {return _pid;}  // particle energy in [GeV]
+  D_Particle(const TLorentzVector & p, const int pid, const float etacalo, const float phicalo) : 
+        _fourmomentum(p), _pid(pid), _etaCalo(etacalo), _phiCalo(phicalo) {}
+  //D_Particle(const float e, const float eta, const float phi, const float pt, const int pid) : 
+  //    _pid(pid), _etaCalo(UNDEFINED), _phiCalo(UNDEFINED) { TLorentzVector p; p.SetPtEtaPhiE(pt,eta,phi,e); _fourmomentum = p; }
+  D_Particle(const float px, const float py, const float pz, const float e, const int pid) :
+        _fourmomentum(px,py,pz,e), _pid(pid), _etaCalo(UNDEFINED), _phiCalo(UNDEFINED) {}
+
+  const float E() const {return _fourmomentum.E();}    // particle energy [GeV]
+  const float Px() const {return _fourmomentum.Px();}  // horizontal coordinate of momentum [GeV]
+  const float Py() const {return _fourmomentum.Py();}  // vertical coordinate of momentum [GeV]
+  const float Pz() const {return _fourmomentum.Pz();}  // longitudinal coordinate of momentum [GeV]
+  const float Pt() const {return _fourmomentum.Pt();}  // transverse momentum [GeV]
+  const float EtaCalo() const {return _etaCalo;}  // pseudorapidity 
+  const float Eta() const {return _fourmomentum.Eta();}  // pseudorapidity 
+  const float PhiCalo() const {return _phiCalo;}  // azimuthal angle 
+  const float Phi() const  {return _fourmomentum.Phi();}  // azimuthal angle 
+  const int PID() const {return _pid;}  // particle energy in [GeV]
+  const TLorentzVector& getFourMomentum() const {return _fourmomentum;}
 
  private:
-  float _e, _px, _py, _pz, _pt;
-  float _eta, _etaCalo, _phi, _phiCalo; 
+  TLorentzVector _fourmomentum;
   int _pid;
+  float _etaCalo, _phiCalo; 
 };
-
-#ifndef __PI__
-#define __PI__
-extern const float pi = 3.14159265358979312;
-#endif 
 
 class RESOLution
@@ -93 +96 @@
   float VFD_s_zdc;   // distance of the Zero Degree Calorimeter, from the Interaction poin, in [m]
 
-  float  RP_220_s; // distance of the RP to the IP, in meters
-  float  RP_220_x; // distance of the RP to the beam, in meters
-  float  RP_420_s; // distance of the RP to the IP, in meters
-  float  RP_420_x; // distance of the RP to the beam, in meters
+  float RP_220_s; // distance of the RP to the IP, in meters
+  float RP_220_x; // distance of the RP to the beam, in meters
+  float RP_420_s; // distance of the RP to the IP, in meters
+  float RP_420_x; // distance of the RP to the beam, in meters
   string RP_beam1Card; // 
   string RP_beam2Card; // 
@@ -186 +189 @@
  int FLAG_bfield;               //flag for bfield propagation
  int FLAG_vfd;                  //flag for very forward detector
+ int FLAG_zdc;                  //flag for very forward detector
  
  int NEvents_Frog;
@@ -191 +195 @@
 
   // to sort a vector
-  void SortedVector(vector<ParticleUtil> &vect);
+  //void SortedVector(vector<ParticleUtil> &vect);
+  void SortedVector(vector<D_Particle> &vect);
 
   /// Reads the data card for the initialisation of the parameters 
@@ -227 +232 @@
 
 };
-
-
-// particles PID (PDG ID)
-const int pU   = 1;    // c quark
-const int pD   = 2;    // b quark
-const int pS   = 3;    // s quark
-const int pC   = 4;    // c quark
-const int pB   = 5;    // b quark
-const int pE   = 11;   // e
-const int pNU1 = 12;   // nu_e
-const int pMU  = 13;   // mu
-const int pNU2 = 14;   // nu_mu
-const int pTAU = 15;   // tau
-const int pNU3 = 16;   // nu_tau
-const int pGLUON = 21; // gluon
-const int pGAMMA = 22; // gamma
-const int pW   = 24;   // W
-const int pP   = 2212; // proton
-const int pN   = 2112; // neutron
-const int pPI0 = 111;  // pi_0
-const int pK0L = 130;  // K^0_L
-const int pK0S = 310;  // K^0_S
-const int pLAMBDA = 3122; // Lambda
-const int pSIGMA0 = 3212;  // Sigma^0
-const int pDELTA0 = 2114;  // Delta^0
-
-const double speed_of_light = 299792458; // m/s
-const float UNDEFINED=-9999.;
-
 
 // ** returns the sign (+1 or -1) or an integer

trunk/interface/TreeClasses.h

@@ -1 +1 @@
 #ifndef TreeClasses_h
 #define TreeClasses_h
+
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
 
 #include "TObject.h"

trunk/interface/TriggerUtil.h

@@ -47 +47 @@
  public:
 
-  TriggerBit(){}; 
+  TriggerBit(); 
   TriggerBit(const TriggerBit& tb);
   TriggerBit& operator=(const TriggerBit& tb);
@@ -87 +87 @@
 
   void TriggerCardReader(const string& filename="data/trigger.dat");
+  // avant, ça s'appellait TriggerReader
+  // appelle la méthode TriggerBit::GetTrigCondition
+
+  
   void PrintTriggerTable(const string& LogName);
+  // fait un cout des triggers bits, c'est toujours pratique
+  // appelle la méthode TriggerBit::PriniTrigCondition
+  
   bool GetGlobalResult(TClonesArray *branchElecTrig, TClonesArray *branchMuonTrig,
       TClonesArray *branchJetTrig, TClonesArray *branchTauJetTrig,
@@ -93 +100 @@
 
   void WriteResult();
+    // sauve dans le TTree
+    // ce nom est stupide, faut le changer
     
  private:
+  //bool Evaluate( int event_i );
+  // boucle sur list_of_trigger_bits, comme on a dit
+  // appelle la methode TriggerBit::Evaluate ou TriggerBit::GetResult (Ã  voir)
+  // renvoie la réponse globale du trigger
+  // Ã  la fin, mettre has_been_evaluated = true;
+  // voir le NB ci-dessous
   
   vector<TriggerBit> list_of_trigger_bits;
   bool has_been_evaluated;
   bool GlobalResult;
+  int event_i;
 
 };

trunk/routines/plot_performances.C

@@ +1 @@
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
+
 #include "interface/FuncDef.h"
 #include "TGraph.h"

trunk/routines/resolutions.C

@@ -328 +328 @@
 void General()
 {
-  //JetResol();
-  //ElecResol();
-  //ETmisResol();
-  TauJetInfo();
-  
-}
-
-
+  JetResol();
+  ElecResol();
+  ETmisResol();
+  //TauJetInfo();
+  
+}
+
+

trunk/src/BFieldProp.cc

@@ -36 +36 @@
 
 //------------------------------------------------------------------------------
+extern const float UNDEFINED;
 
 TrackPropagation::TrackPropagation(){
@@ -315 +316 @@
 
 
-void TrackPropagation::bfield(const TRootGenParticle *Part, float& etacalo, float& phicalo) {
+void TrackPropagation::bfield(TRootGenParticle *Part) {
 
   // initialisation, valid for z_max==0, R_max==0 and q==0
-  etacalo = Part->Eta;
-  phicalo = -atan2(Part->Px,Part->Py);
+  Part->EtaCalo = Part->Eta;
+  Part->PhiCalo = Part->Phi;//-atan2(Part->Px,Part->Py);
+
+  if (!DET->FLAG_bfield ) return;
 
   q  = Charge(Part->PID);
@@ -386 +389 @@
               Eta_t = - log(tan(Theta_t/2.));
       } else{
-                Theta_t=0; Eta_t = 9999;
+                Theta_t=0; Eta_t = UNDEFINED;
       }
 /*      Not needed here. but these formulae are correct -------
@@ -399 +402 @@
         momentum.SetPxPyPzE(Px_t,Py_t,Pz_t,E_t);
 */
-        etacalo = Eta_t;
-        phicalo = Phi_t;
+        Part->EtaCalo = Eta_t;
+        Part->PhiCalo = Phi_t;
         return;
 // test zone ---
@@ -436 +439 @@
 
   } else { // if B_x or B_y are non zero: longer computation
-
+//cout << "bfield de loic\n";
   float Xvertex1 = Part->X;
   float Yvertex1 = Part->Y;
@@ -511 +514 @@
   if(x!=0 && y!=0 && z!=0) {
           Theta = atan2(sqrt(r2),z);
-          etacalo  = -log(tan(Theta/2.));
-          phicalo = atan2(y,x);
+          Part->EtaCalo  = -log(tan(Theta/2.));
+          Part->PhiCalo = atan2(y,x);
           //momentum.SetPtEtaPhiE(Part->PT,eta,phi,Part->E);
   }

trunk/src/HEPEVTConverter.cc

@@ +1 @@
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
+
 #include <iostream>
 #include <utility>

trunk/src/LHEFConverter.cc

@@ +1 @@
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
+
 #include <iostream>
 #include <fstream>

trunk/src/STDHEPConverter.cc

@@ -1 @@
-/*
-  ---- Delphes ----
-  A Fast Simulator for general purpose LHC detector
-  S. Ovyn ~~~~ severine.ovyn@uclouvain.be
-
-  Center for Particle Physics and Phenomenology (CP3)
-  Universite Catholique de Louvain (UCL)
-  Louvain-la-Neuve, Belgium
-*/
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
 
 #include <iostream>

trunk/src/SmearUtil.cc

@@ -30 +30 @@
 ***********************************************************************/
 
+
 /// \file SmearUtil.cc
 /// \brief RESOLution class, and some generic definitions
@@ -42 +43 @@
 #include <iomanip>
 using namespace std;
-
-
-ParticleUtil::ParticleUtil(const TLorentzVector &genMomentum, int pid) {
-  _pid=pid;
-  _e = genMomentum.E();
-  _px = genMomentum.Px();
-  _py = genMomentum.Py();
-  _pz = genMomentum.Pz();
-  _pt = genMomentum.Pt();
-
-  //_e, _px, _py, _pz, _pt;
-  //float _eta, _etaCalo, _phi, _phiCalo;
-  //int _pid;
-}
 
 //------------------------------------------------------------------------------
@@ -78 +65 @@
   // Energy resolution for hadrons in ecal/hcal/hf
   // \sigma/E = C + N/E + S/\sqrt{E}
-  HAD_Shcal         = 1.5;               // S term for central HCAL 
+  HAD_Shcal         = 1.5;               // S term for central HCAL
   HAD_Nhcal         = 0.;                // N term for central HCAL
   HAD_Chcal         = 0.05;              // C term for central HCAL
-  HAD_Shf           = 2.7;               // S term for FCAL
+  HAD_Shf           = 2.7;               // S term for FCAL 
   HAD_Nhf           = 0.;                // N term for FCAL
   HAD_Chf           = 0.13;              // C term for FCAL
@@ -128 +115 @@
   FLAG_bfield      = 1;                       //1 to run the bfield propagation else 0
   FLAG_vfd         = 1;                       //1 to run the very forward detectors else 0
+  FLAG_zdc         = 1;                       //1 to run the zero degree calorimeter else 0
   FLAG_trigger     = 1;                       //1 to run the trigger selection else 0
   FLAG_frog        = 1;                       //1 to run the FROG event display
@@ -186 +174 @@
   RP_cross_y        = 0.0;
   RP_cross_ang      = 142.5;
-
-
   
 }
@@ -250 +236 @@
   FLAG_bfield      = DET.FLAG_bfield;
   FLAG_vfd         = DET.FLAG_vfd;
+  FLAG_zdc         = DET.FLAG_zdc;
   FLAG_trigger     = DET.FLAG_trigger;
   FLAG_frog        = DET.FLAG_frog;
@@ -279 +266 @@
   RP_IP_name        = DET.RP_IP_name;
 
-
   // In case FROG event display allowed
   NEvents_Frog      = DET.NEvents_Frog;
@@ -364 +350 @@
   FLAG_bfield      = DET.FLAG_bfield;
   FLAG_vfd         = DET.FLAG_vfd;
+  FLAG_zdc         = DET.FLAG_zdc;
   FLAG_trigger     = DET.FLAG_trigger;
   FLAG_frog        = DET.FLAG_frog;
@@ -504 +491 @@
 
     else if(strstr(temp_string.c_str(),"FLAG_vfd"))         {curstring >> varname >> ivalue; FLAG_vfd         = ivalue;}
+    else if(strstr(temp_string.c_str(),"FLAG_zdc"))         {curstring >> varname >> ivalue; FLAG_zdc         = ivalue;}
     else if(strstr(temp_string.c_str(),"FLAG_trigger"))     {curstring >> varname >> ivalue; FLAG_trigger     = ivalue;}
     else if(strstr(temp_string.c_str(),"FLAG_frog"))        {curstring >> varname >> ivalue; FLAG_frog        = ivalue;}
@@ -604 +592 @@
   if(FLAG_vfd==1){
     f_out<<"#**********************************                                  *"<<"\n";
-    f_out<<"# Very forward detector switches on                                  *"<<"\n";
+    f_out<<"# Very forward detector switched on                                  *"<<"\n";
     f_out<<"#**********************************                                  *"<<"\n";
     f_out<<"*                                                                    *"<<"\n";
@@ -639 +627 @@
     f_out << left << setw(44) <<"* Angle of  beam crossing:"<<""
           << left << setw(6) <<RP_cross_ang           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
-
     f_out<<"*                                                                    *"<<"\n";
   }
   else {
     f_out<<"#***********************************                                 *"<<"\n";
-    f_out<<"# Very forward detector switches off                                 *"<<"\n";
+    f_out<<"# Very forward detector switched off                                 *"<<"\n";
     f_out<<"#***********************************                                 *"<<"\n";
     f_out<<"*                                                                    *"<<"\n";
@@ -692 +679 @@
   if(FLAG_bfield==1){
     f_out<<"#***************************                                         *"<<"\n";
-    f_out<<"# Magnetic field switches on                                         *"<<"\n";
+    f_out<<"# Magnetic field switched on                                         *"<<"\n";
     f_out<<"#***************************                                         *"<<"\n";
     f_out<<"*                                                                    *"<<"\n";
@@ -713 +700 @@
   else {
     f_out<<"#****************************                                        *"<<"\n";
-    f_out<<"# Magnetic field switches off                                        *"<<"\n";
+    f_out<<"# Magnetic field switched off                                        *"<<"\n";
     f_out<<"#****************************                                        *"<<"\n";
     f_out << left << setw(55) <<"* Minimal pT needed to reach the calorimeter [GeV]: "<<""
@@ -953 +940 @@
 //******************************************************************************************
 
-void RESOLution::SortedVector(vector<ParticleUtil> &vect)
+//void RESOLution::SortedVector(vector<ParticleUtil> &vect)
+void RESOLution::SortedVector(vector<D_Particle> &vect)
 {
   int i,j = 0;
@@ -966 +954 @@
           if ( vect[j].Pt() > vect[j-1].Pt() )
              {
-               ParticleUtil tmp = vect[j-1];
+               //ParticleUtil tmp = vect[j-1];
+               D_Particle tmp = vect[j-1];
                vect[j-1] = vect[j];
                vect[j] = tmp;
@@ -1062 +1051 @@
   //********** returns a segmented value for eta and phi, for calo towers *****
 void RESOLution::BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta){
-   iEta = -100; 
-   int index=-100;
+   iEta = UNDEFINED; 
+   int index= iUNDEFINED;
    for (unsigned int i=1; i< TOWER_number+1; i++) {
         if(fabs(eta)>TOWER_eta_edges[i-1] && fabs(eta)<TOWER_eta_edges[i]) {
@@ -1072 +1061 @@
         }
    }
-   if(index==-100) return; 
-   iPhi = -100;
+   if(index==UNDEFINED) return; 
+   iPhi = UNDEFINED;
    float dphi = TOWER_dphi[index]*pi/180.; 
    for (unsigned int i=1; i < 360/TOWER_dphi[index]; i++ ) {
@@ -1085 +1074 @@
    if (phi > pi-dphi) iPhi = pi-dphi;
 }
+
+
 
 //**************************** Returns the delta Phi ****************************

trunk/src/TreeClasses.cc

@@ +1 @@
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
+
 #include "TreeClasses.h"
 

trunk/src/TreeClassesLinkDef.h

@@ +1 @@
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
+
+
 #include "interface/TreeClasses.h"
 

trunk/src/TriggerUtil.cc

@@ -132 +132 @@
 
 //*************************************************************************
+TriggerBit::TriggerBit() {
+}
 
 TriggerBit::~TriggerBit() {
@@ -143 +145 @@
         EtmisValues.clear();
         GammaValues.clear();
-
 }
 
@@ -153 +154 @@
         IElecValues.push_back(tb.IElecValues[i]);
 
-
   for(unsigned int i=0; i<tb.MuonValues.size(); i++)
         MuonValues.push_back(tb.MuonValues[i]);
@@ -165 +165 @@
   for(unsigned int i=0; i<tb.BjetValues.size(); i++)
         BjetValues.push_back(tb.BjetValues[i]);
-
 
   for(unsigned int i=0; i<tb.TauJetValues.size(); i++)
@@ -218 +217 @@
       TClonesArray *branchPhotonTrig,  TClonesArray *branchETmisTrig)
 {
-
   TSimpleArray<TRootJet> bjets=SubArrayBjets(branchJetTrig);
   TSimpleArray<TRootElectron> Ielectron=SubArrayIElec(branchElecTrig);
   TSimpleArray<TRootMuon> Imuon=SubArrayIMuon(branchMuonTrig);
- 
+
   int elec_size = ElecValues.size();
   int Ielec_size = IElecValues.size();
@@ -263 +261 @@
         }
 
-
       if(muon_size!=0){
         TRootMuon *muon;
@@ -287 +284 @@
            if(jet->PT < JetValues[i])Result=false;}}
 
-      if(jet_size!=0){
-        TRootJet *jet;
-        for(int i=0;i<jet_size;i++){
-           jet = (TRootJet*)branchJetTrig->At(i);
-           if(jet->PT < JetValues[i])Result=false;}}
-
       if(bjet_size!=0)
         {
@@ -304 +295 @@
         }
 
-
       if(taujet_size!=0){
         TRootTauJet *taujet;
@@ -338 +328 @@
   vector<string> BjetSequences;
 
-///  char *result =NULL;
   char * result = new char[256];
   result = strtok( (char*) trigger_algorithm.c_str(),"&");
@@ -354 +343 @@
        result = strtok( NULL,"&");
      }
-  delete result;
+  delete [] result;
 
   ElecValues = GetCuts(ElecSequences);
@@ -368 +357 @@
 }
 
+
 void TriggerBit::PrintTrigCondition(const string& LogName,const int i) 
 {
@@ -379 +369 @@
   int etmis_size = TriggerBit::EtmisValues.size();
   int bjets_size = TriggerBit::BjetValues.size();
-  
+
   ofstream f_out(LogName.c_str(),ios::app);
 
@@ -439 +429 @@
    }
   return OrderedValue;
+
 }
 
@@ -480 +471 @@
 }
 
-