Changeset 2507 in Sophya for trunk/SophyaLib/HiStats/histos.cc

Timestamp:

Mar 15, 2004, 5:47:21 PM (22 years ago)

Author:

ansari

Message:

Remplacement THROW par throw et suppression END_CONSTRUCTOR - Reza 15/03/2004

File:

• trunk/SophyaLib/HiStats/histos.cc (modified) (20 diffs)

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.16 2003-03-10 14:10:24 ansari Exp $
+// $Id: histos.cc,v 1.17 2004-03-15 16:47:20 ansari Exp $
 //
 
@@ -26 +26 @@
   binWidth(0)
 {
- END_CONSTRUCTOR
 }
 
@@ -39 +38 @@
 {
   Zero();
-  END_CONSTRUCTOR
 }
 
@@ -52 +50 @@
 {
   Zero();
-  END_CONSTRUCTOR
 }
 
@@ -71 +68 @@
     }
   }
-  END_CONSTRUCTOR
 }
 
@@ -168 +164 @@
 Histo& Histo::operator /= (r_8 b)
 {
-if (b==0.) THROW(inconsistentErr);
+if (b==0.) throw ParmError(PExcLongMessage(""));
 r_8 b2 = b*b;
 for(int_4 i=0;i<mBins;i++) {
@@ -213 +209 @@
 Histo& Histo::operator += (const Histo& a)
 {
-if(mBins!=a.mBins) THROW(sizeMismatchErr);
+if(mBins!=a.mBins) throw SzMismatchError(PExcLongMessage(""));
 for(int_4 i=0;i<mBins;i++) {
   mData[i] += a(i);
@@ -231 +227 @@
 Histo& Histo::operator -= (const Histo& a)
 {
-if(mBins!=a.mBins) THROW(sizeMismatchErr);
+if(mBins!=a.mBins) throw SzMismatchError(PExcLongMessage(""));
 for(int_4 i=0;i<mBins;i++) {
   mData[i] -= a(i);
@@ -249 +245 @@
 Histo& Histo::operator *= (const Histo& a)
 {
-if(mBins!=a.mBins) THROW(sizeMismatchErr);
+if(mBins!=a.mBins) throw SzMismatchError(PExcLongMessage(""));
 nHist = 0.;
 for(int_4 i=0;i<mBins;i++) {
@@ -269 +265 @@
 Histo& Histo::operator /= (const Histo& a)
 {
-if(mBins!=a.mBins) THROW(sizeMismatchErr);
+if(mBins!=a.mBins) throw SzMismatchError(PExcLongMessage(""));
 nHist = 0.;
 for(int_4 i=0;i<mBins;i++) {
@@ -339 +335 @@
 void Histo::PutValue(TVector<r_8> &v, int_4 ierr)
 {
-//if(v.NElts()<(uint_4) mBins) THROW(sizeMismatchErr);
+//if(v.NElts()<(uint_4) mBins) throw SzMismatchError(PExcLongMessage(""));
 uint_4 n = (v.NElts()<(uint_4) mBins) ? v.NElts(): (uint_4) mBins;
 if(n>0) for(uint_4 i=0;i<n;i++) {
@@ -353 +349 @@
 void Histo::PutValueAdd(TVector<r_8> &v, int_4 ierr)
 {
-//if(v.NElts()<(uint_4) mBins) THROW(sizeMismatchErr);
+//if(v.NElts()<(uint_4) mBins) throw SzMismatchError(PExcLongMessage(""));
 uint_4 n = (v.NElts()<(uint_4) mBins) ? v.NElts(): (uint_4) mBins;
 if(n>0) for(uint_4 i=0;i<n;i++) {
@@ -367 +363 @@
 void Histo::PutError2(TVector<r_8> &v)
 {
-//if(v.NElts()<(uint_4) mBins) THROW(sizeMismatchErr);
+//if(v.NElts()<(uint_4) mBins) throw SzMismatchError(PExcLongMessage(""));
 uint_4 n = (v.NElts()<(uint_4) mBins) ? v.NElts(): (uint_4) mBins;
 if(n>0) {
@@ -381 +377 @@
 void Histo::PutError2Add(TVector<r_8> &v)
 {
-//if(v.NElts()<(uint_4) mBins) THROW(sizeMismatchErr);
+//if(v.NElts()<(uint_4) mBins) throw SzMismatchError(PExcLongMessage(""));
 uint_4 n = (v.NElts()<(uint_4) mBins) ? v.NElts(): (uint_4) mBins;
 if(n>0) {
@@ -395 +391 @@
 void Histo::PutError(TVector<r_8> &v)
 {
-//if(v.NElts()<(uint_4) mBins) THROW(sizeMismatchErr);
+//if(v.NElts()<(uint_4) mBins) throw SzMismatchError(PExcLongMessage(""));
 uint_4 n = (v.NElts()<(uint_4) mBins) ? v.NElts(): (uint_4) mBins;
 if(n>0) {
@@ -955 +951 @@
     cout<<"Histo::FitMax : Nb Entrees histo ="<<NEntries()<<endl;
 
-  if (NEntries() < 1) THROW(inconsistentErr);
+  if (NEntries() < 1) throw ParmError(PExcLongMessage(""));
 
   int_4 iMax = IMax();
@@ -1021 +1017 @@
     for(k=0;k<nLowHigh;k++) cout<<" "<<e2Fit(k); cout<<endl;
   }
-  if( ii != nLowHigh ) THROW(inconsistentErr);
+  if( ii != nLowHigh ) throw ParmError(PExcLongMessage(""));
   Poly pol(degree);
   TRY {
@@ -1049 +1045 @@
     // on est dans le cas d'un fit de parabole
     r_8 r=0;
-    if (pol.Root1(r)==0) THROW(inconsistentErr);
+    if (pol.Root1(r)==0) throw ParmError(PExcLongMessage(""));
     fd = r + xCenter;
   } else if (DPolDeg == 2) {
@@ -1055 +1051 @@
     r_8 r1=0;
     r_8 r2=0;
-    if (pol.Root2(r1,r2) == 0) THROW(inconsistentErr);
+    if (pol.Root2(r1,r2) == 0) throw ParmError(PExcLongMessage(""));
     pol.Derivate();
     fd = (pol(r1)<0) ? r1 + xCenter : r2 + xCenter;
   } else {
     // on est dans un cas non prevu
-    THROW(inconsistentErr);
+    throw ParmError(PExcLongMessage(""));
   }
 
@@ -1104 +1100 @@
          << " , nbin= " << NBins() << endl;
 
-  if (NEntries() < 1) THROW(inconsistentErr);
-  if (NBins() < 3) THROW(inconsistentErr);
+  if (NEntries() < 1) throw ParmError(PExcLongMessage(""));
+  if (NBins() < 3) throw ParmError(PExcLongMessage(""));
 
   int_4 iMax = FindBin(xmax);
-  if (iMax<0 || iMax>=NBins()) THROW(inconsistentErr);
+  if (iMax<0 || iMax>=NBins()) throw ParmError(PExcLongMessage(""));
   r_8 hmax = mData[iMax];
   r_8 limit = frac*hmax;