ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.h
(Generate patch)

Comparing UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.h (file contents):
Revision 1.9 by lantonel, Wed Feb 13 12:51:21 2013 UTC vs.
Revision 1.10 by lantonel, Thu Feb 21 16:37:09 2013 UTC

# Line 20 | Line 20
20   #include "DataFormats/Common/interface/Handle.h"
21   #include "CommonTools/UtilAlgos/interface/TFileService.h"
22   #include "FWCore/Framework/interface/MakerMacros.h"
23 + #include "DataFormats/Math/interface/deltaPhi.h"
24 + #include "DataFormats/Math/interface/deltaR.h"
25  
26   #include "ProductArea/BNcollections/interface/BNbxlumi.h"
27   #include "ProductArea/BNcollections/interface/BNelectron.h"
# Line 59 | Line 61 | class OSUAnalysis : public edm::EDAnalyz
61  
62        double valueLookup (const BNjet* object, string variable, string function = "");
63        double valueLookup (const BNmuon* object, string variable, string function = "");
64 +      double valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function = "");
65        double valueLookup (const BNelectron* object, string variable, string function = "");
66 +      double valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function = "");
67 +      double valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function = "");
68        double valueLookup (const BNevent* object, string variable, string function = "");
69        double valueLookup (const BNtau* object, string variable, string function = "");
70        double valueLookup (const BNmet* object, string variable, string function = "");
# Line 130 | Line 135 | class OSUAnalysis : public edm::EDAnalyz
135          vector<double> bins;
136          string inputCollection;
137          vector<string> inputVariables;
133 –        string function;
138        } histogram;
139  
140        struct cut {
141          string inputCollection;
142 <        string variable;
143 <        string comparativeOperator;
144 <        string function;
145 <        double cutValue;
142 >        vector<string> functions;
143 >        vector<string> variables;
144 >        vector<string> comparativeOperators;// >, <, =, etc.
145 >        vector<double> cutValues;
146 >        vector<string> logicalOperators;//and, or
147 >        int numSubcuts;
148          int    numberRequired;
149          string eventComparativeOperator;
150          string name;
# Line 158 | Line 164 | class OSUAnalysis : public edm::EDAnalyz
164        PUWeight *puWeight_;
165  
166        template <class InputCollection> void setObjectFlags(cut &, uint, flagMap &, flagMap &, InputCollection, string);
167 <      template <class InputCollection>  void fill1DHistogram(TH1*, histogram, InputCollection, vector<bool>, double);
168 <      template <class InputCollection>  void fill2DHistogram(TH2*, histogram, InputCollection, vector<bool>, double);
169 <
167 >      template <class InputCollection1, class InputCollection2> void setObjectFlags(cut &, uint, flagMap &, flagMap &, InputCollection1, InputCollection2, string);
168 >      template <class InputCollection> void fill1DHistogram(TH1*, histogram, InputCollection, vector<bool>, double);
169 >      template <class InputCollection1, class InputCollection2> void fill1DHistogram(TH1*, histogram, InputCollection1, InputCollection2, vector<bool>, vector<bool>, vector<bool>, double);
170 >      template <class InputCollection> void fill2DHistogram(TH2*, histogram, InputCollection, vector<bool>, double);
171 >      template <class InputCollection1, class InputCollection2> void fill2DHistogram(TH2*, histogram, InputCollection1, InputCollection2, vector<bool>, vector<bool>, vector<bool>, double);
172  
173  
174    };

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines