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

Timestamp:

Mar 6, 2002, 5:50:30 PM (24 years ago)

Author:

perderos

Message:

1) ajout de commande pour trace de champ de vecteur
2) modif pour compil sous peida (pawexecut.cc) OP 06/03/2002

File:

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

trunk/SophyaPI/PIext/pawexecut.cc

@@ -82 +82 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
+//#ifndef SANS_EVOLPLANCK
 kw = "v/integ";
-usage = "Integrate a TVector";
+usage = "Integrate a TVector / vector";
 usage += "\n v/integ namevec [norm]";
 usage += "\n norm<=0 means no normalisation (def norm=0)";
 usage += "\n  Related commands: h/integ h/deriv v/deriv";
 piac->RegisterCommand(kw,usage,this,hgrp);
+//#endif
 
 kw = "h/deriv";
@@ -95 +97 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
+//#ifndef SANS_EVOLPLANCK
 kw = "v/deriv";
-usage = "Derivate a TVector";
+usage = "Derivate a TVector / vector";
 usage += "\n v/deriv namevec [deriv_option]";
 usage += "\n deriv_option -1 replace v[i] with v[i]-v[i-1]";
@@ -103 +106 @@
 usage += "\n  Related commands: h/integ h/deriv v/integ";
 piac->RegisterCommand(kw,usage,this,hgrp);
+//#endif
 
 kw = "h/rebin";
@@ -231 +235 @@
 } else if(kw == "h/integ") {
   h_integ(tokens); return(0);
+  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/integ") {
   v_integ(tokens); return(0);
+  //#endif
 } else if(kw == "h/deriv") {
   h_deriv(tokens); return(0);
+  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/deriv") {
   v_deriv(tokens); return(0);
+  //#endif
 } else if(kw == "h/rebin") {
   h_rebin(tokens); return(0);
@@ -586 +594 @@
 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)
-  {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" not a TVector"<<endl;
-  return;}
+  {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" not a TVector/Vector"<<endl;
+  return;}
+
+#ifdef SANS_EVOLPLANCK
+uint_4 n = v->NElts();
+#else
 uint_4 n = v->Size();
+#endif
+
 if(n==0)
   {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" is an empty vector"<<endl;
@@ -636 +655 @@
 int_4 deriv_option = 0;
 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)
-  {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" not a TVector"<<endl;
-  return;}
+  {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" not a TVector/Vector"<<endl;
+  return;}
+
+
+#ifdef SANS_EVOLPLANCK
+uint_4 n = v->NElts();
+#else
 uint_4 n = v->Size();
+#endif
+
 if(n==0)
   {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" is an empty vector"<<endl;
   return;}
 if(n<=1) return;
+
+#ifdef SANS_EVOLPLANCK
+Vector vsave(*v);
+#else
 TVector<r_8> vsave(*v,false);
+#endif
+
 if(deriv_option<0) {
   for(uint_4 i=1;i<n;i++) (*v)(i) = vsave(i)-vsave(i-1);
@@ -658 +696 @@
 }
 }
+
 
 /* methode */