Changeset 3572 in Sophya for trunk/SophyaPI/PIext/pawexecut.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

• trunk/SophyaPI/PIext/pawexecut.cc (modified) (12 diffs)

trunk/SophyaPI/PIext/pawexecut.cc

@@ -23 +23 @@
 #include "pihisto.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#include "matrix.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
-#endif
 
 /* Reza + cmv  13/10/99 */
@@ -421 +416 @@
 string ctyp = typeid(*mobj).name();
 
-#ifdef SANS_EVOLPLANCK
-if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Zero();}
-else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Zero();}
-#else
  if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; (*ob) = 0.; }
 // ob->DataBlock().Reset(0.);}
  else if(typeid(*mobj)==typeid(Matrix))   {Matrix*  ob=(Matrix*) mobj; (*ob) = 0.; }
 //ob->DataBlock().Reset(0.);}
-#endif
 else if(typeid(*mobj)==typeid(Histo))    {Histo* ob=(Histo*)  mobj; ob->Zero();}
 else if(typeid(*mobj)==typeid(HProf))    {HProf* ob=(HProf*)  mobj; ob->Zero();}
@@ -701 +691 @@
   }
 }   // fin du try
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); cout<<endl; cerr<<endl;
-  string es = PeidaExc(merr);
-  cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<merr<<es;
-} ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); cout<<endl; cerr<<endl;
   cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<exc.Msg()<<endl; 
 }
-#endif
 
 if(adel) delete objnt;
@@ -1380 +1362 @@
 r_8 norm=-1.;
 if(tokens.size()>=2) norm = atof(tokens[1].c_str());
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
+
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1390 +1369 @@
   return;}
 
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1507 +1482 @@
 if(tokens.size()>=2) deriv_option = atoi(tokens[1].c_str());
 
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1517 +1488 @@
   return;}
 
-
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1529 +1495 @@
 if(n<=1) return;
 
-#ifdef SANS_EVOLPLANCK
-Vector vsave(*v);
-#else
 TVector<r_8> vsave(*v,false);
-#endif
 
 if(deriv_option<0) {
@@ -1742 +1704 @@
   Vector* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Vector(*h1);
-#else
     h3 = new Vector(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1758 +1716 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Operations on Matrix
@@ -1781 +1733 @@
   Matrix* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Matrix(*h1);
-#else
     h3 = new Matrix(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1798 +1746 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Doesn't work for other objects