Changeset 9 in svn

Timestamp:

Nov 5, 2008, 7:10:54 PM (16 years ago)

Author:

Xavier Rouby

Message:

first commit

Location:

trunk

Files:

• Makefile (modified) (8 diffs)
• README (modified) (1 diff)
• Resolutions.cpp (added)
• TODO (modified) (1 diff)
• genMakefile.tcl (modified) (2 diffs)
• routines (added)
• routines/resolutions.C (added)
• src/SmearUtil.cc (modified) (1 diff)

trunk/Makefile

@@ -28 +28 @@
 
 
+Resolutions$(ExeSuf): \
+        tmp/Resolutions.$(ObjSuf)
+
+tmp/Resolutions.$(ObjSuf): \
+        Resolutions.cpp \
+        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
+        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
+        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
+        Utilities/CDFCones/interface/JetCluAlgorithm.h \
+        Utilities/CDFCones/interface/MidPointAlgorithm.h \
+        Utilities/CDFCones/interface/PhysicsTower.h \
+        Utilities/CDFCones/interface/Cluster.h \
+        interface/DataConverter.h \
+        interface/HEPEVTConverter.h \
+        interface/LHEFConverter.h \
+        interface/STDHEPConverter.h \
+        interface/SmearUtil.h \
+        interface/TreeClasses.h
 Delphes$(ExeSuf): \
         tmp/Delphes.$(ObjSuf)
@@ -46 +64 @@
         interface/SmearUtil.h
 EXECUTABLE =  \
+        Resolutions$(ExeSuf) \
         Delphes$(ExeSuf)
 
 EXECUTABLE_OBJ =  \
+        tmp/Resolutions.$(ObjSuf) \
         tmp/Delphes.$(ObjSuf)
 
@@ -54 +74 @@
         Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h \
         Utilities/ExRootAnalysis/interface/BlockClasses.h
+tmp/src/TreeClassesDict.$(SrcSuf): \
+        src/TreeClassesLinkDef.h
 DICT =  \
-        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf)
+        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf) \
+        tmp/src/TreeClassesDict.$(SrcSuf)
 
 DICT_OBJ =  \
-        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(ObjSuf)
+        tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(ObjSuf) \
+        tmp/src/TreeClassesDict.$(ObjSuf)
 
 tmp/src/STDHEPConverter.$(ObjSuf): \
@@ -70 +94 @@
         Utilities/stdhep/stdhep_declarations.h \
         interface/STDHEPConverter.h
+tmp/src/TreeClasses.$(ObjSuf): \
+        src/TreeClasses.$(SrcSuf) \
+        interface/TreeClasses.h
 tmp/src/LHEFConverter.$(ObjSuf): \
         src/LHEFConverter.$(SrcSuf) \
@@ -169 +196 @@
 SOURCE_OBJ =  \
         tmp/src/STDHEPConverter.$(ObjSuf) \
+        tmp/src/TreeClasses.$(ObjSuf) \
         tmp/src/LHEFConverter.$(ObjSuf) \
         tmp/src/HEPEVTConverter.$(ObjSuf) \
@@ -228 +256 @@
         Utilities/mcfio/mcf_ntubldInit.c
 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \
-        Utilities/stdhep/mcf_hepev4_xdr.c
+        Utilities/stdhep/mcf_hepev4_xdr.c \
+        Utilities/mcfio/mcfio_Dict.h \
+        Utilities/mcfio/mcf_xdr.h \
+        Utilities/stdhep/stdhep.h \
+        Utilities/stdhep/hepev4.h \
+        Utilities/stdhep/stdtmp.h \
+        Utilities/stdhep/stdver.h
 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \
-        Utilities/stdhep/mcf_stdcm1_xdr.c
+        Utilities/stdhep/mcf_stdcm1_xdr.c \
+        Utilities/mcfio/mcfio_Dict.h \
+        Utilities/mcfio/mcf_xdr.h \
+        Utilities/stdhep/stdcm1.h \
+        Utilities/stdhep/stdver.h
 tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \
-        Utilities/stdhep/mcf_hepup_xdr.c
+        Utilities/stdhep/mcf_hepup_xdr.c \
+        Utilities/mcfio/mcfio_Dict.h \
+        Utilities/mcfio/mcf_xdr.h \
+        Utilities/stdhep/hepeup.h \
+        Utilities/stdhep/heprup.h \
+        Utilities/stdhep/stdver.h
 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \
-        Utilities/stdhep/mcf_Stdhep_xdr.c
+        Utilities/stdhep/mcf_Stdhep_xdr.c \
+        Utilities/mcfio/mcfio_Dict.h \
+        Utilities/mcfio/mcf_xdr.h \
+        Utilities/stdhep/stdhep.h \
+        Utilities/stdhep/stdtmp.h \
+        Utilities/stdhep/stdver.h
 tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf): \
-        Utilities/stdhep/stdhep_internal_utils.c
+        Utilities/stdhep/stdhep_internal_utils.c \
+        Utilities/stdhep/stdhep.h \
+        Utilities/stdhep/hepev4.h \
+        Utilities/stdhep/stdtmp.h \
+        Utilities/stdhep/hepeup.h
 tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf): \
-        Utilities/stdhep/stdhep_mcfio.c
+        Utilities/stdhep/stdhep_mcfio.c \
+        Utilities/mcfio/mcf_xdr.h \
+        Utilities/mcfio/mcfio_Block.h \
+        Utilities/mcfio/mcfio_Dict.h \
+        Utilities/mcfio/mcfio_Direct.h \
+        Utilities/mcfio/mcfio_Util1.h \
+        Utilities/stdhep/stdhep.h \
+        Utilities/stdhep/hepev4.h \
+        Utilities/stdhep/hepeup.h \
+        Utilities/stdhep/heprup.h \
+        Utilities/stdhep/stdtmp.h \
+        Utilities/stdhep/stdhd.h \
+        Utilities/stdhep/stdcnt.h \
+        Utilities/stdhep/stdhep_mcfio.h
 STDHEP_OBJ =  \
         tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \
@@ -274 +339 @@
         @touch $@
 
+interface/TreeClasses.h: \
+        Utilities/ExRootAnalysis/interface/BlockCompare.h \
+        Utilities/ExRootAnalysis/interface/BlockClasses.h
+        @touch $@
+
 interface/SmearUtil.h: \
         Utilities/ExRootAnalysis/interface/BlockClasses.h \
@@ -290 +360 @@
         Utilities/CDFCones/interface/LorentzVector.h \
         Utilities/CDFCones/interface/Centroid.h
+        @touch $@
+
+Utilities/stdhep/stdhep_declarations.h: \
+        Utilities/stdhep/stdhep.h \
+        Utilities/stdhep/hepev4.h \
+        Utilities/stdhep/hepeup.h \
+        Utilities/stdhep/heprup.h \
+        Utilities/stdhep/stdtmp.h \
+        Utilities/stdhep/stdhd.h \
+        Utilities/stdhep/stdcnt.h \
+        Utilities/stdhep/stdcm1.h \
+        Utilities/stdhep/stdver.h
         @touch $@
 

trunk/README

@@ -42 +42 @@
 stdhep.ps -> page9 = HEPCHG(ID) : get charge for particle ID
 
+

trunk/TODO

@@ -12 +12 @@
  - vérifier les unités des toutes les valeurs dans les ttree
  - vérifier que les valeurs par défaut sont égales à celles de la datacard par défaut
+ - ajouter FastJet

trunk/genMakefile.tcl

@@ -126 +126 @@
   global prefix suffix objSuf exeSuf
    
-  set executable [glob -nocomplain {Delphes.cpp} ]
+  set executable [glob -nocomplain {Delphes.cpp} {Resolutions.cpp}]
                                 
   set exeFiles {}
@@ -232 +232 @@
 executableDeps {*.cpp} 
 
-dictDeps {DICT} {Utilities/ExRootAnalysis/src/*LinkDef.h}
+dictDeps {DICT} {Utilities/ExRootAnalysis/src/*LinkDef.h} {src/*LinkDef.h}
 
 sourceDeps {SOURCE} {src/*.cc} {Utilities/ExRootAnalysis/src/*.cc} {Utilities/Hector/src/*.cc} {Utilities/CDFCones/src/*cc} 

trunk/src/SmearUtil.cc

@@ -213 +213 @@
   
   if(fabs(hadron.Eta()) < MAX_CALO_CEN) {
-    energyS = gRandom->Gaus(energy_hcal, sqrt(
+    float energyS1 = gRandom->Gaus(energy_hcal, sqrt(
                                               pow(HAD_Nhcal,2) +
                                               pow(HAD_Chcal*energy_hcal,2) + 
-                                              pow(HAD_Shcal*sqrt(energy_hcal),2) )) 
-      +
-      gRandom->Gaus(energy_ecal, sqrt(
+                                              pow(HAD_Shcal*sqrt(energy_hcal),2) )) ;
+      
+    float energyS2 = gRandom->Gaus(energy_ecal, sqrt(
                                       pow(HAD_Necal,2) +
                                       pow(HAD_Cecal*energy_ecal,2) + 
-                                      pow(HAD_Secal*sqrt(energy_ecal),2) ) );     
+                                      pow(HAD_Secal*sqrt(energy_ecal),2) ) );
+
+        energyS = (energyS1>0)?energyS1:0 + (energyS2>0)?energyS2:0;
+        cout << "avant: " << energyS1 + energyS2 << "\t\t" << energyS << endl;
   } else { 
     energyS = gRandom->Gaus(energy,