Changeset 3587 in Sophya for trunk/SophyaLib/NTools/generalfit.cc

Timestamp:

Mar 5, 2009, 2:26:38 PM (17 years ago)

Author:

ansari

Message:

Adaptation suite nettoyage/suppression TRY/CATCH... , Reza 05/03/2009

File:

• trunk/SophyaLib/NTools/generalfit.cc (modified) (4 diffs)

trunk/SophyaLib/NTools/generalfit.cc

@@ -161 +161 @@
  ASSERT(mNPar<1000000);
 
- TRY {
-   General_Init();
- } CATCHALL {
-   THROW_SAME;
- } ENDTRY
-
+ General_Init();
 }
 
@@ -202 +197 @@
  ASSERT( mNPar < 1000000 );
 
- TRY {
-   General_Init();
- } CATCHALL {
-   THROW_SAME;
- } ENDTRY
-
+ General_Init();
 }
 
@@ -242 +232 @@
  GetIntEnv("PDEBUG_GENERALFIT",debugLevel);
 
- TRY {
+ try {
    fixParam   = new unsigned short int[mNPar];
    boundParam = new unsigned short int[mNPar];
    nameParam  = new string[mNPar];
- } CATCHALL {
+ }  
+ catch (...) {
    cout<<"GeneralFit::GeneralFit Impossible d'allouer l'espace"<<endl;
-   THROW_SAME;
- } ENDTRY
+   throw AllocationError("GeneralFit::GeneralFit() error allocating with new ...");
+} 
 
  Param        = (double)  0.;
@@ -910 +901 @@
 
    // Calcul de la matrice des covariances
-#ifdef __mac__
-   COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
-#else
-   TRY {
+   try {
      COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
-   } CATCHALL {
+   } 
+   catch (MathExc& exc) {
      if(debugLevel>0) {
+       cout<<"GeneralFit::Fit()/Exception:" << exc.what() << endl; 
        cout<<"Pb inversion matrice ATGA:"<<endl;
        cout<<ATGA;
      }
      return(-10);
-   } ENDTRY
-#endif
+  }
 
    if (debugLevel >= 3) {