|
[yoda-svn] r395 - trunk/include/YODAblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Oct 11 00:57:52 BST 2011
Author: buckley Date: Tue Oct 11 00:57:52 2011 New Revision: 395 Log: Install Dbn2D.h and add scaling to Point2D and Point3D Modified: trunk/include/YODA/Makefile.am trunk/include/YODA/Point2D.h trunk/include/YODA/Point3D.h Modified: trunk/include/YODA/Makefile.am ============================================================================== --- trunk/include/YODA/Makefile.am Mon Sep 5 13:17:52 2011 (r394) +++ trunk/include/YODA/Makefile.am Tue Oct 11 00:57:52 2011 (r395) @@ -1,7 +1,8 @@ pkginclude_HEADERS = \ Exceptions.h \ AnalysisObject.h \ - Weights.h Bin.h Dbn1D.h \ + Weights.h Bin.h \ + Dbn1D.h Dbn2D.h \ Axis1D.h Bin1D.h \ Axis2D.h Bin2D.h \ Histo1D.h HistoBin1D.h \ Modified: trunk/include/YODA/Point2D.h ============================================================================== --- trunk/include/YODA/Point2D.h Mon Sep 5 13:17:52 2011 (r394) +++ trunk/include/YODA/Point2D.h Tue Oct 11 00:57:52 2011 (r395) @@ -109,16 +109,6 @@ //@} - /// Scaling - void scale(double scaleX, double scaleY) { - setX(x()*scaleX); - setY(y()*scaleY); - - setXErr(xErrMinus()*scaleX, xErrPlus()*scaleX); - setYErr(yErrMinus()*scaleY, yErrPlus()*scaleY); - } - - /// @name x error accessors //@{ @@ -225,6 +215,21 @@ //@} + // @name Manipulations + //@{ + + /// Scaling + void scale(double scaleX, double scaleY) { + setX(x()*scaleX); + setY(y()*scaleY); + + setXErr(xErrMinus()*scaleX, xErrPlus()*scaleX); + setYErr(yErrMinus()*scaleY, yErrPlus()*scaleY); + } + + //@} + + protected: /// @name Value and error variables Modified: trunk/include/YODA/Point3D.h ============================================================================== --- trunk/include/YODA/Point3D.h Mon Sep 5 13:17:52 2011 (r394) +++ trunk/include/YODA/Point3D.h Tue Oct 11 00:57:52 2011 (r395) @@ -103,18 +103,10 @@ /// Set z value void setZ(double z) { _z = z;} + //@} - ///Scaling - void scale(double scaleX, double scaleY, double scaleZ) { - setX(x()*scaleX); - setY(y()*scaleY); - setZ(z()*scaleZ); - - setXErr(xErrMinus()*scaleX, xErrPlus()*scaleX); - setYErr(yErrMinus()*scaleY, yErrPlus()*scaleY); - setZErr(zErrMinus()*scaleZ, zErrPlus()*scaleZ); - } + /// @name x error accessors //@{ @@ -220,6 +212,7 @@ //@} + /// @name z error accessors //@{ @@ -243,18 +236,18 @@ return (_ez.first + _ez.second)/2.0; } - /// Set szmmetric z error + /// Set symmetric z error void setZErr(double ez) { _ez.first = ez; _ez.second = ez; } - /// Set aszmmetric z error + /// Set asymmetric z error void setZErr(std::pair<double,double> ez) { _ez = ez; } - /// Set aszmmetric z error + /// Set asymmetric z error void setZErr(double ezminus, double ezplus) { _ez.first = ezminus; _ez.second = ezplus; @@ -272,6 +265,24 @@ //@} + + // @name Manipulations + //@{ + + /// Scaling + void scale(double scaleX, double scaleY, double scaleZ) { + setX(x()*scaleX); + setY(y()*scaleY); + setZ(z()*scaleZ); + + setXErr(xErrMinus()*scaleX, xErrPlus()*scaleX); + setYErr(yErrMinus()*scaleY, yErrPlus()*scaleY); + setZErr(zErrMinus()*scaleZ, zErrPlus()*scaleZ); + } + + //@} + + protected: /// @name Value and error variables
More information about the yoda-svn mailing list |