Changeset 100 in svn for trunk/interface

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

Location:

trunk/interface

Files:

• BFieldProp.h (modified) (3 diffs)
• JetUtils.h (modified) (3 diffs)
• VeryForward.h (modified) (2 diffs)

trunk/interface/BFieldProp.h

@@ -16 +16 @@
 
 #include "interface/SmearUtil.h"
+
 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
@@ -21 +22 @@
 using namespace std;
 
-class TrackPropagation : public RESOLution{
+class TrackPropagation {
 
  public:
   // Constructor
-    TrackPropagation();
+    TrackPropagation(string DetDatacard);
  
     void Propagation(const TRootGenParticle *Part,TLorentzVector &genMomentum);
@@ -31 +32 @@
     int MAXITERATION;
     int MINSEGLENGTH;
-  
+
+ private:
+
+   RESOLution *DET;  
 };
   

trunk/interface/JetUtils.h

@@ -56 +56 @@
 using namespace std;
 
-class JetsUtil: public RESOLution
+class JetsUtil
 {
  public:
   /// Constructor
-  JetsUtil();
+  JetsUtil(const string DetDatacard);
 
 
@@ -68 +68 @@
   vector<fastjet::PseudoJet> inclusive_jets;
   vector<fastjet::PseudoJet> sorted_jets;
-  vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet> & input_particles);
+  vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet>&  input_particles);
   
   void RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootGenParticle> & NFCentralQ);
@@ -74 +74 @@
   void RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TLorentzVector> & TrackCentral);
 
+ private:
+
+  RESOLution *DET;
 };
 

trunk/interface/VeryForward.h

@@ -35 +35 @@
 using namespace std;
 
-class VeryForward : public RESOLution{
+class VeryForward {
 
  public:
   /// Constructor
-  VeryForward();
+  VeryForward(string DetDatacard);
 
   void ZDC(ExRootTreeWriter *treeWriter,ExRootTreeBranch *branchZDC,TRootGenParticle *particle);
@@ -50 +50 @@
  H_BeamLine* beamline2;
 
+ private:
+ 
+ RESOLution *DET;
+
 };
 #endif