Changeset 219 in svn

Timestamp:

Feb 2, 2009, 12:33:21 PM (16 years ago)

Author:

Xavier Rouby

Message:

JetUtils.cc

Location:

trunk/src

Files:

• BFieldProp.cc (modified) (7 diffs)
• FrogUtil.cc (modified) (12 diffs)
• JetUtils.cc (deleted)
• LHEFConverter.cc (modified) (1 diff)
• SmearUtil.cc (modified) (8 diffs)
• TreeClasses.cc (modified) (1 diff)
• TreeClassesLinkDef.h (modified) (1 diff)
• TriggerUtil.cc (modified) (4 diffs)
• VeryForward.cc (modified) (3 diffs)

trunk/src/BFieldProp.cc

@@ -9 +9 @@
  *             */
 
-#include "interface/BFieldProp.h"
+#include "BFieldProp.h"
 #include<cmath>
-#include "TMath.h"
 using namespace std;
 
@@ -17 +16 @@
 //------------------------------------------------------------------------------
 
-TrackPropagation::TrackPropagation(const string DetDatacard):
- MAXITERATION(10000), q(-9999.), phi_0(-9999.), gammam(-9999.), omega(-9999.), r(-9999.),
- x_c(-9999.), y_c(-9999.), R_c(-9999.), Phi_c(-9999.),
- rr(-9999.), t(-9999.), t_z(-9999.), t_T(-9999.),
- x_t(-9999.), y_t(-9999.), z_t(-9999.), 
- R_t(-9999.), Phi_t(-9999.), Theta_t(-9999.), Eta_t(-9999.),
- Px_t(-9999), Py_t(-9999), Pz_t(-9999), PT_t(-9999), p_t(-9999), E_t(-9999) {
-
- // if(DetDatacard="") { DET = new RESOLution(); }
- // else DET = new RESOLution(DetDatacard);
- DET = new RESOLution();
- DET->ReadDataCard(DetDatacard);
-
- // magnetic field parameters
+TrackPropagation::TrackPropagation(){
+   DET = new RESOLution();
+   init();
+}
+
+TrackPropagation::TrackPropagation(const string& DetDatacard){
+   DET = new RESOLution();
+   DET->ReadDataCard(DetDatacard);
+   init();      
+}
+
+TrackPropagation::TrackPropagation(const RESOLution* DetDatacard){ 
+   DET= new RESOLution(*DetDatacard);
+   init();
+}
+
+TrackPropagation::TrackPropagation(const TrackPropagation & tp){
+   MAXITERATION = tp.MAXITERATION;
+   DET   = new RESOLution(*(tp.DET));
+   R_max = tp.R_max;    z_max = tp.z_max;
+   B_x   = tp.B_x;      B_y   = tp.B_y;         B_z   = tp.B_z;
+   q     = tp.q;        phi_0 = tp.phi_0;       
+   gammam= tp.gammam;   omega = tp.omega;
+   r     = tp.r;        rr    = tp.rr;
+   x_c   = tp.x_c;      y_c   = tp.y_c; 
+   R_c   = tp.R_c;      Phi_c = tp.Phi_c;
+   t     = tp.t;        t_z   = tp.t_z;         t_T   = tp.t_T; 
+   x_t   = tp.x_t;      y_t   = tp.y_t;         z_t   = tp.z_t;
+   R_t   = tp.R_t;      Phi_t = tp.Phi_t;       
+   Theta_t=tp.Theta_t;  Eta_t = tp.Eta_t;
+   Px_t  = tp.Px_t;     Py_t  = tp.Py_t;        Pz_t  = tp.Pz_t;
+   PT_t  = tp.PT_t;     p_t   = tp.p_t;         E_t   = tp.E_t;
+   loop_overflow_counter = tp.loop_overflow_counter;
+}
+
+TrackPropagation& TrackPropagation::operator=(const TrackPropagation & tp) {
+   if(this==&tp) return *this;
+   MAXITERATION = tp.MAXITERATION;
+   DET   = new RESOLution(*(tp.DET));
+   R_max = tp.R_max;    z_max = tp.z_max;
+   B_x   = tp.B_x;      B_y   = tp.B_y;         B_z   = tp.B_z;
+   q     = tp.q;        phi_0 = tp.phi_0;
+   gammam= tp.gammam;   omega = tp.omega;
+   r     = tp.r;        rr    = tp.rr;
+   x_c   = tp.x_c;      y_c   = tp.y_c;
+   R_c   = tp.R_c;      Phi_c = tp.Phi_c;
+   t     = tp.t;        t_z   = tp.t_z;         t_T   = tp.t_T;
+   x_t   = tp.x_t;      y_t   = tp.y_t;         z_t   = tp.z_t;
+   R_t   = tp.R_t;      Phi_t = tp.Phi_t;
+   Theta_t=tp.Theta_t;  Eta_t = tp.Eta_t;
+   Px_t  = tp.Px_t;     Py_t  = tp.Py_t;        Pz_t  = tp.Pz_t;
+   PT_t  = tp.PT_t;     p_t   = tp.p_t;         E_t   = tp.E_t;
+   loop_overflow_counter = tp.loop_overflow_counter;
+   return *this;
+}
+
+
+
+void TrackPropagation::init() {
+ MAXITERATION = 10000; 
+ q= UNDEFINED;  phi_0= UNDEFINED; gammam= UNDEFINED; omega=UNDEFINED; r=UNDEFINED;
+ x_c=UNDEFINED; y_c=UNDEFINED;    R_c=UNDEFINED;     Phi_c=UNDEFINED;
+ rr=UNDEFINED;  t=UNDEFINED;      t_z=UNDEFINED;     t_T=UNDEFINED;
+ x_t=UNDEFINED; y_t=UNDEFINED;    z_t=UNDEFINED;
+ R_t=UNDEFINED; Phi_t=UNDEFINED;  Theta_t=UNDEFINED; Eta_t=UNDEFINED;
+ Px_t=UNDEFINED; Py_t=UNDEFINED;  Pz_t=UNDEFINED;    PT_t=UNDEFINED; p_t=UNDEFINED; E_t=UNDEFINED;
+
+  // DET has been initialised in the constructors
+  // magnetic field parameters
    R_max = DET->TRACK_radius;
    z_max = DET->TRACK_length/2.;
@@ -39 +93 @@
    loop_overflow_counter=0;
 }
+
+
 
 void TrackPropagation::Propagation(const TRootGenParticle *Part,TLorentzVector &momentum) {
@@ -81 +137 @@
       rr = sqrt( pow(R_c,2.) + pow(r,2.) ); // temp variable
       t_T=0;
-      t_z = gammam / Part->Pz * (-Part->Z + z_max* TMath::Sign((Float_t)1.,(Float_t)Part->Pz) ) ;
+      int sign_pz= (Part->Pz >0) ? 1 : -1;
+      t_z = gammam / Part->Pz * (-Part->Z + z_max*sign_pz ) ;
       if ( fabs(R_c - r) > R_max || R_c + r  < R_max ) t = t_z;
       else {
@@ -103 +160 @@
       R_t   = sqrt( pow(x_t,2.) + pow(y_t,2.)  );
       Phi_t = atan2( y_t, x_t);
-/*      if(R_t>0) {
+      if(R_t>0) {
               Theta_t = acos( z_t / sqrt(z_t*z_t+ R_t*R_t));
               Eta_t = - log(tan(Theta_t/2.));
@@ -109 +166 @@
                 Theta_t=0; Eta_t = 9999;
       }
-*/
+
         Px_t = - Part->PT * sin(omega*t + phi_0);
         Py_t =   Part->PT * cos(omega*t + phi_0);
@@ -116 +173 @@
         p_t = sqrt(PT_t*PT_t + Pz_t*Pz_t);
         E_t=sqrt(Part->M*Part->M +p_t);
-        if(p_t != fabs(Pz_t) ) Eta_t = log( (p_t+Pz_t)/(p_t-Pz_t) )/2.;
-        if(p_t>0) Theta_t = acos(Pz_t/p_t);
+        //if(p_t != fabs(Pz_t) ) Eta_t = log( (p_t+Pz_t)/(p_t-Pz_t) )/2.;
+        //if(p_t>0) Theta_t = acos(Pz_t/p_t);
         momentum.SetPxPyPzE(Px_t,Py_t,Pz_t,E_t);
 

trunk/src/FrogUtil.cc

@@ -10 +10 @@
 
 // \brief Trigger class, and some generic definitions
-
-#include "interface/FrogUtil.h"
-#include "TRandom.h"
-
-#include "Utilities/FROG/Includes/FROG/FROG_DetId.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Geometry.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Geometry.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_Events.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Events.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_Element_Tools.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Element_Tools.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_Net_Tools.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Net_Tools.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_Path.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Path.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_Coord.h"
-#include "Utilities/FROG/Includes/FROG/FROG_Coord.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_ReadCards.h"
-#include "Utilities/FROG/Includes/FROG/FROG_ReadCards.cpp"
-#include "Utilities/FROG/Includes/FROG/FROG_ZLib.h"
-#include "Utilities/FROG/Includes/FROG/FROG_ZLib.cpp"
-
 #include <iostream>
-#include <sstream>
-#include <fstream>
-#include <iomanip>
-#include <cstring>
+
+#include "TROOT.h"
+#include "TApplication.h"
+#include "TStyle.h"
+#include "TChain.h"
+#include "TClonesArray.h"
+
+#include "BlockClasses.h"
+#include "ExRootTreeReader.h"
+#include "FrogUtil.h"
+
+#include "FROG_Coord.h"
+#include "FROG_Coord.cpp"
+#include "FROG_Geometry.h"
+#include "FROG_Geometry.cpp"
+#include "FROG_DetId.h"
+#include "FROG_Events.h"
+#include "FROG_Events.cpp"
+#include "FROG_Element_Tools.h"
+#include "FROG_Element_Tools.cpp"
+#include "FROG_Net_Tools.h"
+#include "FROG_Net_Tools.cpp"
+#include "FROG_Path.h"
+#include "FROG_Path.cpp"
+#include "FROG_ReadCards.h"
+#include "FROG_ReadCards.cpp"
+#include "FROG_ZLib.h"
+#include "FROG_ZLib.cpp"
 
 using namespace std;
 using namespace FROG_COORD;
 
-const float twopi = 6.2831;
-
-FrogDisplay::FrogDisplay() {}
-
-//PROTON 1
-void FrogDisplay::Build_1Event(FROG_Element_Event* event1)
-{
-  double posp_x = 0.0299923*1000;
-  double posp_y = 0.00602767*1000;
-  double posp_z = 0;
-  FROG_Element_Event_Hit* hitp = new FROG_Element_Event_Hit(500000001 + ((int)posp_z)/50, posp_x, posp_y, posp_z, -1);
-  double dirp_x = 0*1000;
-  double dirp_y = 0*1000;
-  double dirp_z = -1*1000;
-  float Pp =  sqrt(dirp_x*dirp_x + dirp_y*dirp_y + dirp_z*dirp_z);
-  float Ptp =  sqrt(dirp_x*dirp_x + dirp_y*dirp_y);
-  FROG_Element_Base_With_DetId_And_Name* trackCollectionP = new FROG_Element_Base_With_DetId_And_Name(EVTID_TRK+1000, "Tracks: protons");
-  FROG_Element_Event_Track* trackp= new FROG_Element_Event_Track(0,Pp,Ptp,0);
-  trackp->addDaughter(hitp);
-  double pos2p_x = 0.0299923*1000+0*1000*0.4;
-  double pos2p_y = 0.00602767*1000+0*1000*0.4;
-  double pos2p_z = -1*1000*0.4;
-  FROG_Element_Event_Hit* hit2p = new FROG_Element_Event_Hit(500000001 + ((int)pos2p_z)/50, pos2p_x, pos2p_y, pos2p_z, -1);
-  trackp->addDaughter(hit2p);
-  trackCollectionP->addDaughter(trackp);
-  
-  // photon 1
-  FROG_Element_Base_With_DetId_And_Name* trackCollection = new FROG_Element_Base_With_DetId_And_Name(EVTID_TRK,"Tracks: Photons");
-  FROG_Element_Event_Track* track1 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos0_x = 0.0299923*1000;
-  double pos0_y = 0.00602767*1000;
-  double pos0_z = -0.309438*1000;
-  FROG_Element_Event_Hit* hit0 = new FROG_Element_Event_Hit(400000001 + ((int)pos0_z)/50, pos0_x, pos0_y, pos0_z, -1);
-  track1->addDaughter(hit0);
-  double pos1_x = 0.03*1000;
-  double pos1_y = 0.00602856*1000;
-  double pos1_z = -0.309567*1000;
-  FROG_Element_Event_Hit* hit1 = new FROG_Element_Event_Hit(400000001 + ((int)pos1_z)/50, pos1_x, pos1_y, pos1_z, -1);
-  track1->addDaughter(hit1);
-  
-
-  trackCollection->addDaughter(track1);
-  // photon 2
-  FROG_Element_Event_Track* track2 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos2_x = 0.0299923*1000;
-  double pos2_y = 0.00602767*1000;
-  double pos2_z = -0.312795*1000;
-  FROG_Element_Event_Hit* hit2 = new FROG_Element_Event_Hit(400000001 + ((int)pos2_z)/50, pos2_x, pos2_y, pos2_z, -1);
-  track2->addDaughter(hit2);
-  double pos3_x = 0.0291312*1000;
-  double pos3_y = 0.00599684*1000;
-  double pos3_z = -0.326865*1000;
-  FROG_Element_Event_Hit* hit3 = new FROG_Element_Event_Hit(400000001 + ((int)pos3_z)/50, pos3_x, pos3_y, pos3_z, -1);
-  track2->addDaughter(hit3);
-  double pos4_x = 0.0272812*1000;
-  double pos4_y = 0*1000;
-  double pos4_z = -0.325133*1000;
-  FROG_Element_Event_Hit* hit4 = new FROG_Element_Event_Hit(400000001 + ((int)pos4_z)/50, pos4_x, pos4_y, pos4_z, -1);
-  track2->addDaughter(hit4);
-  double pos5_x = 0.0147219*1000;
-  double pos5_y = -0.04071*1000;
-  double pos5_z = -0.313375*1000;
-  FROG_Element_Event_Hit* hit5 = new FROG_Element_Event_Hit(400000001 + ((int)pos5_z)/50, pos5_x, pos5_y, pos5_z, -1);
-  track2->addDaughter(hit5);
-  trackCollection->addDaughter(track2);
-  
-  // photon 3
-  FROG_Element_Event_Track* track3 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos6_x = 0.0299923*1000;
-  double pos6_y = 0.00602767*1000;
-  double pos6_z = -0.241733*1000;
-  FROG_Element_Event_Hit* hit6 = new FROG_Element_Event_Hit(400000001 + ((int)pos6_z)/50, pos6_x, pos6_y, pos6_z, -1);
-  track3->addDaughter(hit6);
-  double pos7_x = 0.0247239*1000;
-  double pos7_y = 0.00635725*1000;
-  double pos7_z = -0.327258*1000;
-  FROG_Element_Event_Hit* hit7 = new FROG_Element_Event_Hit(400000001 + ((int)pos7_z)/50, pos7_x, pos7_y, pos7_z, -1);
-  track3->addDaughter(hit7);
-  double pos8_x = 0.023245*1000;
-  double pos8_y = 0*1000;
-  double pos8_z = -0.325292*1000;
-  FROG_Element_Event_Hit* hit8 = new FROG_Element_Event_Hit(400000001 + ((int)pos8_z)/50, pos8_x, pos8_y, pos8_z, -1);
-  track3->addDaughter(hit8);
-  double pos9_x = 0.0137742*1000;
-  double pos9_y = -0.04071*1000;
-  double pos9_z = -0.312698*1000;
-  FROG_Element_Event_Hit* hit9 = new FROG_Element_Event_Hit(400000001 + ((int)pos9_z)/50, pos9_x, pos9_y, pos9_z, -1);
-  track3->addDaughter(hit9);
-  trackCollection->addDaughter(track3);
-  
-  // photon 4
-  FROG_Element_Event_Track* track4 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos10_x = 0.0299923*1000;
-  double pos10_y = 0.00602767*1000;
-  double pos10_z = -0.103114*1000;
-  FROG_Element_Event_Hit* hit10 = new FROG_Element_Event_Hit(400000001 + ((int)pos10_z)/50, pos10_x, pos10_y, pos10_z, -1);
-  track4->addDaughter(hit10);
-  double pos11_x = 0.0169713*1000;
-  double pos11_y = 0.0106604*1000;
-  double pos11_z = -0.324528*1000;
-  FROG_Element_Event_Hit* hit11 = new FROG_Element_Event_Hit(400000001 + ((int)pos11_z)/50, pos11_x, pos11_y, pos11_z, -1);
-  track4->addDaughter(hit11);
-  double pos12_x = 0.0159847*1000;
-  double pos12_y = 0*1000;
-  double pos12_z = -0.322034*1000;
-  FROG_Element_Event_Hit* hit12 = new FROG_Element_Event_Hit(400000001 + ((int)pos12_z)/50, pos12_x, pos12_y, pos12_z, -1);
-  track4->addDaughter(hit12);
-  double pos13_x = 0.00925296*1000;
-  double pos13_y = -0.0727334*1000;
-  double pos13_z = -0.305018*1000;
-  FROG_Element_Event_Hit* hit13 = new FROG_Element_Event_Hit(400000001 + ((int)pos13_z)/50, pos13_x, pos13_y, pos13_z, -1);
-  track4->addDaughter(hit13);
-  trackCollection->addDaughter(track4);
-  
-  // photon 5
-  FROG_Element_Event_Track* track5 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos14_x = 0.0299923*1000;
-  double pos14_y = 0.00602767*1000;
-  double pos14_z = -0.0550703*1000;
-  FROG_Element_Event_Hit* hit14 = new FROG_Element_Event_Hit(400000001 + ((int)pos14_z)/50, pos14_x, pos14_y, pos14_z, -1);
-  track5->addDaughter(hit14);
-  double pos15_x = 0.03*1000;
-  double pos15_y = 0.00597767*1000;
-  double pos15_z = -0.0558923*1000;
-  FROG_Element_Event_Hit* hit15 = new FROG_Element_Event_Hit(400000001 + ((int)pos15_z)/50, pos15_x, pos15_y, pos15_z, -1);
-  track5->addDaughter(hit15);
-  trackCollection->addDaughter(track5);
-  
-  // photon 6
-  FROG_Element_Event_Track* track6 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos16_x = 0.0299923*1000;
-  double pos16_y = 0.00602767*1000;
-  double pos16_z = -0.0724158*1000;
-  FROG_Element_Event_Hit* hit16 = new FROG_Element_Event_Hit(400000001 + ((int)pos16_z)/50, pos16_x, pos16_y, pos16_z, -1);
-  track6->addDaughter(hit16);
-  double pos17_x = 0.03*1000;
-  double pos17_y = 0.00602949*1000;
-  double pos17_z = -0.0725471*1000;
-  FROG_Element_Event_Hit* hit17 = new FROG_Element_Event_Hit(400000001 + ((int)pos17_z)/50, pos17_x, pos17_y, pos17_z, -1);
-  track6->addDaughter(hit17);
-  trackCollection->addDaughter(track6);
-  
-  // photon 7
-  FROG_Element_Event_Track* track7 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos18_x = 0.0299923*1000;
-  double pos18_y = 0.00602767*1000;
-  double pos18_z = -0.108963*1000;
-  FROG_Element_Event_Hit* hit18 = new FROG_Element_Event_Hit(400000001 + ((int)pos18_z)/50, pos18_x, pos18_y, pos18_z, -1);
-  track7->addDaughter(hit18);
-  double pos19_x = 0.03*1000;
-  double pos19_y = 0.0060305*1000;
-  double pos19_z = -0.109102*1000;
-  FROG_Element_Event_Hit* hit19 = new FROG_Element_Event_Hit(400000001 + ((int)pos19_z)/50, pos19_x, pos19_y, pos19_z, -1);
-  track7->addDaughter(hit19);
-  trackCollection->addDaughter(track7);
-  
-  // photon 8
-  FROG_Element_Event_Track* track8 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos20_x = 0.0299923*1000;
-  double pos20_y = 0.00602767*1000;
-  double pos20_z = -0.189456*1000;
-  FROG_Element_Event_Hit* hit20 = new FROG_Element_Event_Hit(400000001 + ((int)pos20_z)/50, pos20_x, pos20_y, pos20_z, -1);
-  track8->addDaughter(hit20);
-  double pos21_x = 0.0248364*1000;
-  double pos21_y = 0.0129674*1000;
-  double pos21_z = -0.321989*1000;
-  FROG_Element_Event_Hit* hit21 = new FROG_Element_Event_Hit(400000001 + ((int)pos21_z)/50, pos21_x, pos21_y, pos21_z, -1);
-  track8->addDaughter(hit21);
-  double pos22_x = 0.0222521*1000;
-  double pos22_y = 0*1000;
-  double pos22_z = -0.319622*1000;
-  FROG_Element_Event_Hit* hit22 = new FROG_Element_Event_Hit(400000001 + ((int)pos22_z)/50, pos22_x, pos22_y, pos22_z, -1);
-  track8->addDaughter(hit22);
-  double pos23_x = 0.0141387*1000;
-  double pos23_y = -0.04071*1000;
-  double pos23_z = -0.312192*1000;
-  FROG_Element_Event_Hit* hit23 = new FROG_Element_Event_Hit(400000001 + ((int)pos23_z)/50, pos23_x, pos23_y, pos23_z, -1);
-  track8->addDaughter(hit23);
-  trackCollection->addDaughter(track8);
-  
-  // photon 9
-  FROG_Element_Event_Track* track9 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos24_x = 0.0299923*1000;
-  double pos24_y = 0.00602767*1000;
-  double pos24_z = -0.162889*1000;
-  FROG_Element_Event_Hit* hit24 = new FROG_Element_Event_Hit(400000001 + ((int)pos24_z)/50, pos24_x, pos24_y, pos24_z, -1);
-  track9->addDaughter(hit24);
-  double pos25_x = 0.0275782*1000;
-  double pos25_y = 0*1000;
-  double pos25_z = -0.266817*1000;
-  FROG_Element_Event_Hit* hit25 = new FROG_Element_Event_Hit(400000001 + ((int)pos25_z)/50, pos25_x, pos25_y, pos25_z, -1);
-  track9->addDaughter(hit25);
-  trackCollection->addDaughter(track9);
-  
-  // photon 10
-  FROG_Element_Event_Track* track10 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos26_x = 0.0299923*1000;
-  double pos26_y = 0.00602767*1000;
-  double pos26_z = -0.0968708*1000;
-  FROG_Element_Event_Hit* hit26 = new FROG_Element_Event_Hit(400000001 + ((int)pos26_z)/50, pos26_x, pos26_y, pos26_z, -1);
-  track10->addDaughter(hit26);
-  double pos27_x = 0.03*1000;
-  double pos27_y = 0.00603619*1000;
-  double pos27_z = -0.0970637*1000;
-  FROG_Element_Event_Hit* hit27 = new FROG_Element_Event_Hit(400000001 + ((int)pos27_z)/50, pos27_x, pos27_y, pos27_z, -1);
-  track10->addDaughter(hit27);
-  trackCollection->addDaughter(track10);
-  
-  // photon 11
-  FROG_Element_Event_Track* track11 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos28_x = 0.0299923*1000;
-  double pos28_y = 0.00602767*1000;
-  double pos28_z = -0.211734*1000;
-  FROG_Element_Event_Hit* hit28 = new FROG_Element_Event_Hit(400000001 + ((int)pos28_z)/50, pos28_x, pos28_y, pos28_z, -1);
-  track11->addDaughter(hit28);
-  double pos29_x = 0.0231748*1000;
-  double pos29_y = 0.00496626*1000;
-  double pos29_z = -0.328422*1000;
-  FROG_Element_Event_Hit* hit29 = new FROG_Element_Event_Hit(400000001 + ((int)pos29_z)/50, pos29_x, pos29_y, pos29_z, -1);
-  track11->addDaughter(hit29);
-  double pos30_x = 0.0221601*1000;
-  double pos30_y = 0*1000;
-  double pos30_z = -0.326734*1000;
-  FROG_Element_Event_Hit* hit30 = new FROG_Element_Event_Hit(400000001 + ((int)pos30_z)/50, pos30_x, pos30_y, pos30_z, -1);
-  track11->addDaughter(hit30);
-  double pos31_x = 0.0138423*1000;
-  double pos31_y = -0.04071*1000;
-  double pos31_z = -0.312897*1000;
-  FROG_Element_Event_Hit* hit31 = new FROG_Element_Event_Hit(400000001 + ((int)pos31_z)/50, pos31_x, pos31_y, pos31_z, -1);
-  track11->addDaughter(hit31);
-  trackCollection->addDaughter(track11);
-  
-  // photon 12
-  FROG_Element_Event_Track* track12 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos32_x = 0.0299923*1000;
-  double pos32_y = 0.00602767*1000;
-  double pos32_z = -0.233216*1000;
-  FROG_Element_Event_Hit* hit32 = new FROG_Element_Event_Hit(400000001 + ((int)pos32_z)/50, pos32_x, pos32_y, pos32_z, -1);
-  track12->addDaughter(hit32);
-  double pos33_x = 0.03*1000;
-  double pos33_y = 0.00603839*1000;
-  double pos33_z = -0.233429*1000;
-  FROG_Element_Event_Hit* hit33 = new FROG_Element_Event_Hit(400000001 + ((int)pos33_z)/50, pos33_x, pos33_y, pos33_z, -1);
-  track12->addDaughter(hit33);
-  trackCollection->addDaughter(track12);
-  
-  // photon 13
-  FROG_Element_Event_Track* track13 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos34_x = 0.0299923*1000;
-  double pos34_y = 0.00602767*1000;
-  double pos34_z = -0.0352209*1000;
-  FROG_Element_Event_Hit* hit34 = new FROG_Element_Event_Hit(400000001 + ((int)pos34_z)/50, pos34_x, pos34_y, pos34_z, -1);
-  track13->addDaughter(hit34);
-  double pos35_x = 0.03*1000;
-  double pos35_y = 0.00603501*1000;
-  double pos35_z = -0.0353909*1000;
-  FROG_Element_Event_Hit* hit35 = new FROG_Element_Event_Hit(400000001 + ((int)pos35_z)/50, pos35_x, pos35_y, pos35_z, -1);
-  track13->addDaughter(hit35);
-  trackCollection->addDaughter(track13);
-  
-  // photon 14
-  FROG_Element_Event_Track* track14 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos36_x = 0.0299923*1000;
-  double pos36_y = 0.00602767*1000;
-  double pos36_z = -0.0678788*1000;
-  FROG_Element_Event_Hit* hit36 = new FROG_Element_Event_Hit(400000001 + ((int)pos36_z)/50, pos36_x, pos36_y, pos36_z, -1);
-  track14->addDaughter(hit36);
-  double pos37_x = 0.03*1000;
-  double pos37_y = 0.00602573*1000;
-  double pos37_z = -0.0680089*1000;
-  FROG_Element_Event_Hit* hit37 = new FROG_Element_Event_Hit(400000001 + ((int)pos37_z)/50, pos37_x, pos37_y, pos37_z, -1);
-  track14->addDaughter(hit37);
-  trackCollection->addDaughter(track14);
-  
-  // photon 15
-  FROG_Element_Event_Track* track15 = new FROG_Element_Event_Track(0,1,1,0);
-  double pos38_x = 0.0299923*1000;
-  double pos38_y = 0.00602767*1000;
-  double pos38_z = -0.0418564*1000;
-  FROG_Element_Event_Hit* hit38 = new FROG_Element_Event_Hit(400000001 + ((int)pos38_z)/50, pos38_x, pos38_y, pos38_z, -1);
-  track15->addDaughter(hit38);
-  double pos39_x = 0.0281432*1000;
-  double pos39_y = 0*1000;
-  double pos39_z = -0.148365*1000;
-  FROG_Element_Event_Hit* hit39 = new FROG_Element_Event_Hit(400000001 + ((int)pos39_z)/50, pos39_x, pos39_y, pos39_z, -1);
-  track15->addDaughter(hit39);
-  trackCollection->addDaughter(track15);
-  event1->addDaughter(trackCollectionP);
-  event1->addDaughter(trackCollection);
-
-}
-
-void FrogDisplay::BuidEvents(string outputfilename,int nEntryFrog)
-{
+const float twopi = 6.283185307179586476925286766559;
+
+FrogDisplay::FrogDisplay() {
+  //Smearing information
+  DET = new RESOLution();
+  nEntryFrog = DET->NEvents_Frog;
+}
+
+FrogDisplay::FrogDisplay(const string& DetDatacard) {
+  //Smearing information
+  DET = new RESOLution();
+  DET->ReadDataCard(DetDatacard);
+  nEntryFrog = DET->NEvents_Frog;
+}
+
+FrogDisplay::FrogDisplay(const RESOLution* DetDatacard) {
+  //Smearing information
+  DET = new RESOLution(*DetDatacard);
+  nEntryFrog = DET->NEvents_Frog;
+}
+
+FrogDisplay::FrogDisplay(const FrogDisplay& frog) {
+  DET = new RESOLution(*(frog.DET));
+  nEntryFrog = DET->NEvents_Frog;
+}
+
+FrogDisplay& FrogDisplay::operator=(const FrogDisplay& frog) {
+  if (this==&frog) return *this;
+  DET = new RESOLution(*(frog.DET));
+  nEntryFrog = DET->NEvents_Frog;
+  return *this;
+}
+
+void FrogDisplay::BuildEvents(const string& outputfilename) {
   const Font_t kExRootFont = 42;
   const Float_t kExRootFontSize = 0.07;
@@ -371 +113 @@
   TRootETmis*    met;
   
-  Long64_t allEntries;
-  allEntries=treeReader->GetEntries();
+  unsigned int allEntries=treeReader->GetEntries();
   
   FROG_Events* frog_events = new FROG_Events();
-  if(nEntryFrog > allEntries)
-    {
-      cout<<"nEntry to display by frog greater than number of available events... Exit"<<endl;
-      return;
-    }
-  for(Int_t entry = 0; entry < nEntryFrog; ++entry){
-//    cout<<"Event n° "<<entry<<endl;
+  if(nEntryFrog > allEntries) {
+      cout<<"nEntry to display by FROG greater than number of available events... "<<endl;
+      nEntryFrog = allEntries;
+  }
+
+  for(unsigned int entry = 0; entry < nEntryFrog; ++entry){
+    //cout<<"Event n° "<<entry<<endl;
     treeReader   ->ReadEntry(entry);
     treeReaderGen->ReadEntry(entry);
     
     //Create a new event
-    
     FROG_Element_Event* frog_event =  new FROG_Element_Event(1,entry);
     frog_events->AddEvent(frog_event);
@@ -393 +133 @@
     FROG_Element_Base_With_DetId_And_Name* frog_branchSIM = new FROG_Element_Base_With_DetId_And_Name(EVTID_SIM,"SIM");
     frog_event->addDaughter(frog_branchSIM);
-    
+   
+ 
     //SIM ELEC
     //Create a new sub-branch in the SIM branch with name Electrons: this sub branch will contais all the electrons
@@ -401 +142 @@
     for(int p=0;p<branchElectron->GetEntriesFast();p++){
       elec = (TRootElectron*) branchElectron->At(p);
-//      cout<<"Elec nO "<<p<<" PT: "<<elec->PT<<" Eta "<<elec->Eta<<" Phi"<<elec->Phi<<endl;
+      //      cout<<"Elec nO "<<p<<" PT: "<<elec->PT<<" Eta "<<elec->Eta<<" Phi"<<elec->Phi<<endl;
       FROG_Element_Event_Candidate* frog_elec = new FROG_Element_Event_Candidate(11,elec->E,elec->Eta,elec->Phi);
-      
       frog_branchElectrons->addDaughter(frog_elec);
     }
+
     
     //SIM MUONS
@@ -413 +154 @@
     for(int p=0;p<branchMuon->GetEntriesFast();p++){
       muon = (TRootMuon*) branchMuon->At(p);
-//      cout<<"Muon nO"<<p<<" PT: "<<muon->PT<<"Eta "<<muon->Eta<<" Phi"<<muon->Phi<<endl;
+      //      cout<<"Muon nO"<<p<<" PT: "<<muon->PT<<"Eta "<<muon->Eta<<" Phi"<<muon->Phi<<endl;
       FROG_Element_Event_Candidate* frog_muon = new FROG_Element_Event_Candidate(13,muon->E,muon->Eta,muon->Phi);
       frog_branchMuons->addDaughter(frog_muon);
     }
+
     
     //SIM TAUS
@@ -424 +166 @@
     for(int p=0;p<branchTau->GetEntriesFast();p++){
       tau = (TRootTauJet*) branchTau->At(p);
-//      cout<<"Tau nO"<<p<<" PT: "<<tau->PT<<"Eta "<<tau->Eta<<" Phi"<<tau->Phi<<endl;
+      //      cout<<"Tau nO"<<p<<" PT: "<<tau->PT<<"Eta "<<tau->Eta<<" Phi"<<tau->Phi<<endl;
       FROG_Element_Event_Candidate* frog_tau = new FROG_Element_Event_Candidate(15,tau->E,tau->Eta,tau->Phi);
       frog_branchTaus->addDaughter(frog_tau);
     }
+
     
     //SIM PHOTONS
@@ -435 +178 @@
     for(int p=0;p<branchPhoton->GetEntriesFast();p++){
       photon = (TRootPhoton*) branchPhoton->At(p);
-//      cout<<"Photon nO"<<p<<" PT: "<<photon->PT<<"Eta "<<photon->Eta<<" Phi"<<photon->Phi<<endl;
+      //      cout<<"Photon nO"<<p<<" PT: "<<photon->PT<<"Eta "<<photon->Eta<<" Phi"<<photon->Phi<<endl;
       FROG_Element_Event_Candidate* frog_photon = new FROG_Element_Event_Candidate(22,photon->E,photon->Eta,photon->Phi);
       frog_branchPhotons->addDaughter(frog_photon);
     }
+
     
     //SIM JETS
@@ -446 +190 @@
     for(int p=0;p<branchJet->GetEntriesFast();p++){
       jet = (TRootJet*) branchJet->At(p);
-//      cout<<"Jet nO"<<p<<" PT: "<<jet->PT<<"Eta "<<jet->Eta<<" Phi"<<jet->Phi<<endl;
+      //      cout<<"Jet nO"<<p<<" PT: "<<jet->PT<<"Eta "<<jet->Eta<<" Phi"<<jet->Phi<<endl;
       FROG_Element_Event_Jet* frog_jet = new FROG_Element_Event_Jet(jet->E,jet->Eta,jet->Phi);
       frog_branchJets->addDaughter(frog_jet);
     }
     
+
     //SIM MET
     //Create a new sub-branch in the SIM branch with name MET: this sub branch will contais all the METs
@@ -457 +202 @@
     for(int p=0;p<branchMET->GetEntriesFast();p++){
       met = (TRootETmis*) branchMET->At(p);
-//      cout<<"MET nO"<<p<<" ET: "<<met->ET<<"Eta "<<0<<" Phi"<<met->Phi<<endl;
+      //      cout<<"MET nO"<<p<<" ET: "<<met->ET<<"Eta "<<0<<" Phi"<<met->Phi<<endl;
       FROG_Element_Event_MET* frog_met = new FROG_Element_Event_MET(0,met->ET,0,met->Phi, met->ET);
       frog_branchMET->addDaughter(frog_met);
@@ -465 +210 @@
     frog_events->SaveInLive("DelphesToFrog.vis",false,false,(unsigned int)-1);
   }
-  
+ 
+/* Pointer hierachy
+ frog_events
+  -frog_event
+    -frog_branchSIM
+      -frog_branchElectrons
+         -frog_elec
+      -frog_branchMuons
+         -frog_muon
+      -frog_branchTaus 
+         -frog_tau 
+      -frog_branchPhotons 
+         -frog_photon 
+      -frog_photon 
+         -frog_jet 
+      -frog_branchMET 
+         -frog_met 
+*/
+ 
   delete treeReader;
   delete treeReaderGen;
   delete frog_events;
-}
-
-void FrogDisplay::BuildGeom(string DetDatacard)
-{
-  //Smearing information
-  RESOLution *DET = new RESOLution();
-  DET->ReadDataCard(DetDatacard);
- 
+  delete chain;
+  delete chainGen;
+}
+
+void FrogDisplay::BuildGeom() {
+
   // This element is the root of the "file" tree.  (don't change this line)
   FROG_Element_Base* prim = new FROG_Element_Base(C_PRIMARY);
-  
+
   FROG_Element_Base* mygeom = new FROG_Element_Base(C_GEOMETRY);
   prim->addDaughter(mygeom);
@@ -508 +269 @@
   if(ray < rayCone)ray=rayCone;
 
-  double dphi  = 6.283185307179586476925286766559 /NumPhi;
+  double dphi  = twopi /NumPhi;
   for(double phi=0; phi<=twopi/frac;phi+=dphi){
 
@@ -726 +487 @@
     CALOFWD->addDaughter(caloFWDB2);   DetIdCountCaloFwd++;
   }
-  
-  
-  
-  
+
   FROG_Geometry* CustomGeom = new FROG_Geometry(prim);
   CustomGeom->Save("DelphesToFrog.geom");
-  
+
+  delete prim;
+  delete CustomGeom;
+
+/* pointer hierarchy
+prim
+ -> mygeom
+     -> detector
+          ->  Tracker
+          ->  CALO
+          ->  MUON
+          ->  CALOFWD
+pointers that have been added into others will be properly deleted by the destructor of their "mother"
+*/
+
+
   //FROG_ELEMENT::PrintTree(prim);
   return;
 
 }
-

trunk/src/LHEFConverter.cc

@@ -4 +4 @@
 #include "TLorentzVector.h"
 
-#include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
-#include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
-#include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
-
-#include "interface/LHEFConverter.h"
-#include "Utilities/ExRootAnalysis/interface/LHEF.h"
+#include "ExRootTreeWriter.h"
+#include "BlockClasses.h"
+#include "LHEFConverter.h"
 
 using namespace std;

trunk/src/SmearUtil.cc

@@ -13 +13 @@
 
 
-#include "interface/SmearUtil.h"
+#include "SmearUtil.h"
 #include "TRandom.h"
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
-#include <fstream>
 #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;
+}
 
 //------------------------------------------------------------------------------
@@ -147 +158 @@
 }
 
+
+RESOLution::RESOLution(const RESOLution & DET) {
+  // Detector characteristics
+  CEN_max_tracker   = DET.CEN_max_tracker; 
+  CEN_max_calo_cen  = DET.CEN_max_calo_cen;
+  CEN_max_calo_fwd  = DET.CEN_max_calo_fwd;
+  CEN_max_mu        = DET.CEN_max_mu;
+  
+  // Energy resolution for electron/photon
+  ELG_Scen          = DET.ELG_Scen;
+  ELG_Ncen          = DET.ELG_Ncen;
+  ELG_Ccen          = DET.ELG_Ccen;
+  ELG_Cfwd          = DET.ELG_Cfwd;
+  ELG_Sfwd          = DET.ELG_Sfwd;
+  ELG_Nfwd          = DET.ELG_Nfwd;
+
+  // Energy resolution for hadrons in ecal/hcal/hf
+  HAD_Shcal         = DET.HAD_Shcal;
+  HAD_Nhcal         = DET.HAD_Nhcal;
+  HAD_Chcal         = DET.HAD_Chcal;
+  HAD_Shf           = DET.HAD_Shf;
+  HAD_Nhf           = DET.HAD_Nhf;
+  HAD_Chf           = DET.HAD_Chf;
+
+  // Muon smearing
+  MU_SmearPt        = DET.MU_SmearPt;
+
+  // Tracking efficiencies
+  TRACK_ptmin       = DET.TRACK_ptmin;
+  TRACK_eff         = DET.TRACK_eff;
+
+  // Calorimetric towers
+  TOWER_number      = DET.TOWER_number;
+  TOWER_eta_edges = new float[TOWER_number+1];
+  for(unsigned int i=0; i<TOWER_number +1; i++) TOWER_eta_edges[i] = DET.TOWER_eta_edges[i];
+
+  TOWER_dphi = new float[TOWER_number];
+  for(unsigned int i=0; i<TOWER_number; i++) TOWER_dphi[i] = DET.TOWER_dphi[i];
+
+  // Thresholds for reconstructed objetcs
+  PTCUT_elec      = DET.PTCUT_elec;
+  PTCUT_muon      = DET.PTCUT_muon;
+  PTCUT_jet       = DET.PTCUT_jet;
+  PTCUT_gamma     = DET.PTCUT_gamma;
+  PTCUT_taujet    = DET.PTCUT_taujet;
+
+  // General jet variable
+  JET_coneradius   = DET.JET_coneradius;
+  JET_jetalgo      = DET.JET_jetalgo;
+  JET_seed         = DET.JET_seed;
+
+  // Tagging definition
+  BTAG_b           = DET.BTAG_b;
+  BTAG_mistag_c    = DET.BTAG_mistag_c;
+  BTAG_mistag_l    = DET.BTAG_mistag_l;
+
+  // FLAGS
+  FLAG_bfield      = DET.FLAG_bfield;
+  FLAG_vfd         = DET.FLAG_vfd;
+  FLAG_trigger     = DET.FLAG_trigger;
+  FLAG_frog        = DET.FLAG_frog;
+
+  // In case BField propagation allowed
+  TRACK_radius      = DET.TRACK_radius;
+  TRACK_length      = DET.TRACK_length;
+  TRACK_bfield_x    = DET.TRACK_bfield_x;
+  TRACK_bfield_y    = DET.TRACK_bfield_y;
+  TRACK_bfield_z    = DET.TRACK_bfield_z;
+
+  // In case Very forward detectors allowed
+  VFD_min_calo_vfd  = DET.VFD_min_calo_vfd;
+  VFD_max_calo_vfd  = DET.VFD_max_calo_vfd;
+  VFD_min_zdc       = DET.VFD_min_zdc;
+  VFD_s_zdc         = DET.VFD_s_zdc;
+
+  RP_220_s          = DET.RP_220_s;
+  RP_220_x          = DET.RP_220_x;
+  RP_420_s          = DET.RP_420_s;
+  RP_420_x          = DET.RP_420_x;
+
+  // In case FROG event display allowed
+  NEvents_Frog      = DET.NEvents_Frog;
+
+  JET_overlap      = DET.JET_overlap;
+  // MidPoint algorithm definition
+  JET_M_coneareafraction = DET.JET_M_coneareafraction;
+  JET_M_maxpairsize      = DET.JET_M_maxpairsize;
+  JET_M_maxiterations    = DET.JET_M_maxiterations;
+  // Define Cone algorithm.
+  JET_C_adjacencycut     = DET.JET_C_adjacencycut;
+  JET_C_maxiterations    = DET.JET_C_maxiterations;
+  JET_C_iratch           = DET.JET_C_iratch;
+  //Define SISCone algorithm.
+  JET_S_npass            = DET.JET_S_npass;
+  JET_S_protojet_ptmin   = DET.JET_S_protojet_ptmin;
+
+  //For Tau-jet definition
+  TAU_energy_scone = DET.TAU_energy_scone;
+  TAU_track_scone  = DET.TAU_track_scone;
+  TAU_track_pt     = DET.TAU_track_pt;
+  TAU_energy_frac  = DET.TAU_energy_frac;
+
+  PT_QUARKS_MIN    = DET.PT_QUARKS_MIN;
+}
+
+RESOLution& RESOLution::operator=(const RESOLution& DET) {
+  if(this==&DET) return *this;
+  // Detector characteristics
+  CEN_max_tracker   = DET.CEN_max_tracker; 
+  CEN_max_calo_cen  = DET.CEN_max_calo_cen;
+  CEN_max_calo_fwd  = DET.CEN_max_calo_fwd;
+  CEN_max_mu        = DET.CEN_max_mu;
+  
+  // Energy resolution for electron/photon
+  ELG_Scen          = DET.ELG_Scen;
+  ELG_Ncen          = DET.ELG_Ncen;
+  ELG_Ccen          = DET.ELG_Ccen;
+  ELG_Cfwd          = DET.ELG_Cfwd;
+  ELG_Sfwd          = DET.ELG_Sfwd;
+  ELG_Nfwd          = DET.ELG_Nfwd;
+
+  // Energy resolution for hadrons in ecal/hcal/hf
+  HAD_Shcal         = DET.HAD_Shcal;
+  HAD_Nhcal         = DET.HAD_Nhcal;
+  HAD_Chcal         = DET.HAD_Chcal;
+  HAD_Shf           = DET.HAD_Shf;
+  HAD_Nhf           = DET.HAD_Nhf;
+  HAD_Chf           = DET.HAD_Chf;
+
+  // Muon smearing
+  MU_SmearPt        = DET.MU_SmearPt;
+
+  // Tracking efficiencies
+  TRACK_ptmin       = DET.TRACK_ptmin;
+  TRACK_eff         = DET.TRACK_eff;
+
+  // Calorimetric towers
+  TOWER_number      = DET.TOWER_number;
+  TOWER_eta_edges = new float[TOWER_number+1];
+  for(unsigned int i=0; i<TOWER_number +1; i++) TOWER_eta_edges[i] = DET.TOWER_eta_edges[i];
+
+  TOWER_dphi = new float[TOWER_number];
+  for(unsigned int i=0; i<TOWER_number; i++) TOWER_dphi[i] = DET.TOWER_dphi[i];
+
+  // Thresholds for reconstructed objetcs
+  PTCUT_elec      = DET.PTCUT_elec;
+  PTCUT_muon      = DET.PTCUT_muon;
+  PTCUT_jet       = DET.PTCUT_jet;
+  PTCUT_gamma     = DET.PTCUT_gamma;
+  PTCUT_taujet    = DET.PTCUT_taujet;
+
+  // General jet variable
+  JET_coneradius   = DET.JET_coneradius;
+  JET_jetalgo      = DET.JET_jetalgo;
+  JET_seed         = DET.JET_seed;
+
+  // Tagging definition
+  BTAG_b           = DET.BTAG_b;
+  BTAG_mistag_c    = DET.BTAG_mistag_c;
+  BTAG_mistag_l    = DET.BTAG_mistag_l;
+
+  // FLAGS
+  FLAG_bfield      = DET.FLAG_bfield;
+  FLAG_vfd         = DET.FLAG_vfd;
+  FLAG_trigger     = DET.FLAG_trigger;
+  FLAG_frog        = DET.FLAG_frog;
+
+  // In case BField propagation allowed
+  TRACK_radius      = DET.TRACK_radius;
+  TRACK_length      = DET.TRACK_length;
+  TRACK_bfield_x    = DET.TRACK_bfield_x;
+  TRACK_bfield_y    = DET.TRACK_bfield_y;
+  TRACK_bfield_z    = DET.TRACK_bfield_z;
+
+  // In case Very forward detectors allowed
+  VFD_min_calo_vfd  = DET.VFD_min_calo_vfd;
+  VFD_max_calo_vfd  = DET.VFD_max_calo_vfd;
+  VFD_min_zdc       = DET.VFD_min_zdc;
+  VFD_s_zdc         = DET.VFD_s_zdc;
+
+  RP_220_s          = DET.RP_220_s;
+  RP_220_x          = DET.RP_220_x;
+  RP_420_s          = DET.RP_420_s;
+  RP_420_x          = DET.RP_420_x;
+
+  // In case FROG event display allowed
+  NEvents_Frog      = DET.NEvents_Frog;
+
+  JET_overlap      = DET.JET_overlap;
+  // MidPoint algorithm definition
+  JET_M_coneareafraction = DET.JET_M_coneareafraction;
+  JET_M_maxpairsize      = DET.JET_M_maxpairsize;
+  JET_M_maxiterations    = DET.JET_M_maxiterations;
+  // Define Cone algorithm.
+  JET_C_adjacencycut     = DET.JET_C_adjacencycut;
+  JET_C_maxiterations    = DET.JET_C_maxiterations;
+  JET_C_iratch           = DET.JET_C_iratch;
+  //Define SISCone algorithm.
+  JET_S_npass            = DET.JET_S_npass;
+  JET_S_protojet_ptmin   = DET.JET_S_protojet_ptmin;
+
+  //For Tau-jet definition
+  TAU_energy_scone = DET.TAU_energy_scone;
+  TAU_track_scone  = DET.TAU_track_scone;
+  TAU_track_pt     = DET.TAU_track_pt;
+  TAU_energy_frac  = DET.TAU_energy_frac;
+
+  PT_QUARKS_MIN    = DET.PT_QUARKS_MIN;
+  return *this;
+}
+
+
+
+
 //------------------------------------------------------------------------------
 void RESOLution::ReadDataCard(const string datacard) {
@@ -155 +380 @@
   ifstream fichier_a_lire(datacard.c_str());
   if(!fichier_a_lire.good()) {
-    cout << datacard << "Datadard " << datacard << " not found, use default values" << endl;
+    cout <<"**        Datadard  not found, use default values                  **" << endl;
     return;
   }
@@ -252 +477 @@
 }
 
-void RESOLution::Logfile(string LogName) { 
+void RESOLution::Logfile(const string& LogName) { 
   //void RESOLution::Logfile(string outputfilename) { 
   
@@ -617 +842 @@
   energyS = ((energyS1>0)?energyS1:0) + ((energyS2>0)?energyS2:0);
   } 
-  if(abs(hadron.Eta()) > CEN_max_calo_cen && fabs(hadron.Eta()) < CEN_max_calo_fwd){ 
+  if(fabs(hadron.Eta()) > CEN_max_calo_cen && fabs(hadron.Eta()) < CEN_max_calo_fwd){ 
     energyS = gRandom->Gaus(energy, sqrt(
                             pow(HAD_Nhf,2) +
@@ -720 +945 @@
 //***********************Isolation criteria***********************
 //****************************************************************
-bool RESOLution::Isolation(Float_t phi,Float_t eta,const vector<TLorentzVector> &tracks,float PT_TRACK2)
+bool RESOLution::Isolation(const float phi, const float eta,const vector<TLorentzVector> &tracks, const float pt_second_track)
 {
    bool isolated = false;
-   Float_t deltar=5000.; // Initial value; should be high; no further repercussion
+   float deltar=5000.; // Initial value; should be high; no further repercussion
    // loop on all final charged particles, with p_t >2, close enough from the electron
    for(unsigned int i=0; i < tracks.size(); i++) 
       {
-       if(tracks[i].Pt() < PT_TRACK2)continue;
-       Float_t genDeltaR = DeltaR(phi,eta,tracks[i].Phi(),tracks[i].Eta());    // slower to evaluate
+       if(tracks[i].Pt() < pt_second_track)continue;
+       float genDeltaR = DeltaR(phi,eta,tracks[i].Phi(),tracks[i].Eta()); 
          if(
              (genDeltaR > deltar) ||
@@ -735 +960 @@
            deltar=genDeltaR;
       }
-   if(deltar > 0.5)isolated = true; // returns the closest distance
+   if(deltar > 0.5) isolated = true;
    return isolated;
 }
@@ -769 +994 @@
 float DeltaPhi(const float phi1, const float phi2) {
   float deltaphi=phi1-phi2; // in here, -PI < phi < PI
-  if(fabs(deltaphi) > PI) deltaphi=2.*PI-fabs(deltaphi);// put deltaphi between 0 and PI
+  if(fabs(deltaphi) > PI) {
+        deltaphi=2.*PI -fabs(deltaphi);// put deltaphi between 0 and PI
+        }
   else deltaphi=fabs(deltaphi);
   

trunk/src/TreeClasses.cc

@@ -1 @@
-#include "interface/TreeClasses.h"
+#include "TreeClasses.h"
 
 TCompare *RESOLJET::fgCompare =0;

trunk/src/TreeClassesLinkDef.h

@@ -34 +34 @@
 #pragma link C++ class TWOLEPTON;
 
-
-//$$$$$$$$$$$$$$$$$$
 #pragma link C++ class RESOLJET;
 #pragma link C++ class RESOLELEC;

trunk/src/TriggerUtil.cc

@@ -11 +11 @@
 // \brief Trigger class, and some generic definitions
 
-#include "interface/TriggerUtil.h"
-#include "TRandom.h"
+#include "TriggerUtil.h"
 
 #include <iostream>
+#include <iomanip>
 #include <sstream>
 #include <fstream>
-#include <iomanip>
-#include <cstring>
+#include <string>
 
 using namespace std;
@@ -26 +25 @@
 }
 
-void TriggerTable::TriggerCardReader(const string filename){
+void TriggerTable::TriggerCardReader(const string& filename){
    ifstream trigger_file(filename.c_str());
    if( !trigger_file.good() ) {
@@ -49 +48 @@
 
 
-void TriggerTable::PrintTriggerTable(string LogName) {
+void TriggerTable::PrintTriggerTable(const string& LogName) {
 
   ofstream f_out(LogName.c_str(),ios::app);
@@ -186 +185 @@
 
 }
-void TriggerBit::PrintTrigCondition(string LogName,int i) 
+
+
+void TriggerBit::PrintTrigCondition(const string& LogName,const int i) 
 {
   int elec_size = TriggerBit::ElecValues.size();

trunk/src/VeryForward.cc

@@ -9 +9 @@
  *             */
 
-#include "interface/VeryForward.h"
-#include "interface/SmearUtil.h"
-#include "TRandom.h"
-
+#include "VeryForward.h"
+#include "H_RomanPot.h"
 #include <iostream>
-#include <sstream>
-#include <fstream>
-#include <iomanip>
-
 #include<cmath>
-
 
 using namespace std;
@@ -26 +19 @@
 //------------------------------------------------------------------------------
 
-VeryForward::VeryForward(string DetDatacard) {
- 
- DET = new RESOLution();
- DET->ReadDataCard(DetDatacard);
- 
+VeryForward::VeryForward() {
+   DET = new RESOLution();
+   init();
+}
+
+VeryForward::VeryForward(const string& DetDatacard) {
+   DET = new RESOLution();
+   DET->ReadDataCard(DetDatacard);
+   init();
+}
+
+VeryForward::VeryForward(const RESOLution * DetDatacard) {
+   DET = new RESOLution(*DetDatacard);
+   init();
+}
+
+VeryForward::VeryForward(const VeryForward& vf) {
+   DET = new RESOLution(*(vf.DET));
+   beamline1 = new H_BeamLine(*(vf.beamline1));
+   beamline2 = new H_BeamLine(*(vf.beamline2));
+}
+
+VeryForward& VeryForward::operator=(const VeryForward& vf){
+   if (this==&vf) return *this;
+   DET = new RESOLution(*(vf.DET));
+   beamline1 = new H_BeamLine(*(vf.beamline1));
+   beamline2 = new H_BeamLine(*(vf.beamline2));
+   return *this;
+}
+
+
+void VeryForward::init() { 
   //Initialisation of Hector
   relative_energy = true; // should always be true
@@ -52 +72 @@
   beamline2->add(rp220_2);
   beamline2->add(rp420_2); 
-  
   
 }