Merge pull request cms-sw#14 from BetterWang/evtplane_75X_PR_fix

Evtplane 75X fix
ssanders50 · May 19, 2015 · c65589c · c65589c
2 parents 7526c2a + 34f8a82
commit c65589c
Show file tree

Hide file tree

Showing 13 changed files with 461 additions and 591 deletions.
diff --git a/DataFormats/HeavyIonEvent/interface/EvtPlane.h b/DataFormats/HeavyIonEvent/interface/EvtPlane.h
@@ -14,51 +14,41 @@
 
 #include <vector>
 #include <string>
-#include <math.h>
+#include <cmath>
 
 namespace reco { class EvtPlane {
   public:
     EvtPlane(int epindx=0, int level = 2, double planeA=0,double sumSin=0, double sumCos=0, double sumw = 0, double sumw2 = 0, double pe = 0, double pe2 = 0, uint mult = 0);
     virtual ~EvtPlane();
     void AddLevel(int level, double ang, double sumsin, double sumcos);
     int indx() const { return indx_ ;}
-    double      angle(int level=2)   const { return (level>=0||level<=2)? angle_[level]:angle_[2]; }
-    double      sumSin(int level=2)  const { return (level>=0||level<=2)? sumSin_[level]:sumSin_[2];}
-    double      sumCos(int level=2)  const { return (level>=0||level<=2)? sumCos_[level]:sumCos_[2];}
-    double      sumw() const { return sumw_;}
-    double      sumw2() const { return sumw2_;}
-    double      sumPtOrEt() const { return sumPtOrEt_;}
-    double      sumPtOrEt2() const { return sumPtOrEt2_;}
-    double      mult()    const { return mult_;}
-    double      Qy(int level=2) const { return sumSin(level); }
-    double      Qx(int level=2) const { return sumCos(level); }
-    double      Q(int level=2)  const { return ((pow(Qx(level),2)+pow(Qy(level),2))>0)? sqrt(pow(Qx(level),2)+pow(Qy(level),2)): 0.;}
-    double      qy(int level=2) const { return (mult_>0)? ((level>=0||level<=2)? sumSin_[level]/sqrt((double)mult_):sumSin_[2]/sqrt((double) mult_)):0.;}
-    double      qx(int level=2) const { return (mult_>0)? ((level>=0||level<=2)? sumCos_[level]/sqrt((double)mult_):sumCos_[2]/sqrt((double) mult_)):0.;}
-    double      q(int level=2)  const { return ((pow(qx(level),2)+pow(qy(level),2))>0)? sqrt(pow(qx(level),2)+pow(qy(level),2)): 0.;}
-    double      vn(int level=2) const{ return (Q(level)>0 && fabs(sumw())>0)? Q(level)/fabs(sumw()): 0.;}   
+    float	angle(int level=2)   const { return (level>=0||level<=2)? angle_[level]:angle_[2]; }
+    float	sumSin(int level=2)  const { return (level>=0||level<=2)? sumSin_[level]:sumSin_[2];}
+    float	sumCos(int level=2)  const { return (level>=0||level<=2)? sumCos_[level]:sumCos_[2];}
+    float	sumw() const { return sumw_;}
+    float	sumw2() const { return sumw2_;}
+    float	sumPtOrEt() const { return sumPtOrEt_;}
+    float	sumPtOrEt2() const { return sumPtOrEt2_;}
+    float	mult()    const { return mult_;}
+    float	qy(int level=2) const { return sumSin(level); }
+    float	qx(int level=2) const { return sumCos(level); }
+    float	q(int level=2)  const { return ((pow(qx(level),2)+pow(qy(level),2))>0)? sqrt(pow(qx(level),2)+pow(qy(level),2)): 0.;}
+    float	vn(int level=2) const{ return (q(level)>0 && fabs(sumw())>0)? q(level)/fabs(sumw()): 0.;}
 
   private:
-    int           indx_;
-    double        angle_[4];
-    double        sumSin_[4];
-    double        sumCos_[4];
-    double        sumw_;
-    double        sumw2_;
-    double        sumPtOrEt_;
-    double        sumPtOrEt2_;
-    uint          mult_;
-    
+    int		indx_;
+    float	angle_[4];
+    float	sumSin_[4];
+    float	sumCos_[4];
+    float	sumw_;
+    float	sumw2_;
+    float	sumPtOrEt_;
+    float	sumPtOrEt2_;
+    uint	mult_;
+
   };
-  
+
   typedef std::vector<EvtPlane> EvtPlaneCollection;
-
 }
 
-#endif 
-
-
-
-
-
-
+#endif
diff --git a/DataFormats/HeavyIonEvent/src/EvtPlane.cc b/DataFormats/HeavyIonEvent/src/EvtPlane.cc
@@ -1,31 +1,3 @@
-// //
-// // $Id: EvtPlane.cc,v 1.4 2009/09/08 12:33:12 edwenger Exp $
-// //
-// 
-// #include "DataFormats/HeavyIonEvent/interface/EvtPlane.h"
-// 
-// using namespace reco;
-// 
-// EvtPlane::EvtPlane(double planeA, std::string label)
-//   : 
-//    angle_(planeA),
-//    label_(label)
-// {
-//   // default constructor
-// }
-// 
-// 
-// EvtPlane::~EvtPlane()
-// {
-// }
-// 
-// 
-
-
-//
-// $Id: EvtPlane.cc,v 1.4 2009/09/08 12:33:12 edwenger Exp $
-//
-
 #include "DataFormats/HeavyIonEvent/interface/EvtPlane.h"
 
 using namespace reco;
@@ -39,14 +11,12 @@ EvtPlane::EvtPlane(int epindx, int level, double planeA,double sumSin, double su
    sumPtOrEt2_(sumPtOrEt2),
    mult_(mult)
 {
+	for ( int i = 0; i < 4; ++i ) {
+		angle_[i] = sumSin_[i] = sumCos_[i] = -10;
+	}
   angle_[level] = planeA;
   sumSin_[level] = sumSin;
   sumCos_[level] = sumCos;
-  if(level<2) {
-    angle_[2] = planeA;
-    sumSin_[2] = sumSin;
-    sumCos_[2] = sumCos;
-  }
   // default constructor
 }
 void EvtPlane::AddLevel(int level, double ang, double sumsin, double sumcos) {

diff --git a/DataFormats/HeavyIonEvent/src/classes_def.xml b/DataFormats/HeavyIonEvent/src/classes_def.xml
@@ -1,6 +1,7 @@
 <lcgdict>
-<class name="reco::EvtPlane" ClassVersion="13">
- <version ClassVersion="13" checksum="1724486218"/>
+<class name="reco::EvtPlane" ClassVersion="14">
+ <version ClassVersion="14" checksum="393681411"/>
+ <version ClassVersion="11" checksum="393681411"/>
 </class>
 <class name="edm::Wrapper<reco::EvtPlane>"/>
 <class name="reco::Centrality" ClassVersion="10">