Changeset 2922 in Sophya

Timestamp:

Mar 27, 2006, 6:57:19 PM (20 years ago)

Author:

ansari

Message:

Ajout commande expmeansig pour TD/TP SurvEnv - Reza 27/3/2006

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (3 diffs)
• servnobjm.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -785 +785 @@
     }
   srvo->PrepareNTExpressionCFile(tokens[0],tokens[1], tokens[2]);
+  }
+
+else if (kw == "expmeansig" ) {
+  if (tokens.size() < 2) { 
+    cout << "Usage: expmeansig nameobj expx [expcut loop_par]" << endl;
+    return(0);
+    }
+  while (tokens.size() < 4) tokens.push_back("");
+  string dummy = "";
+  cout << " expmeansig: computing mean/sigma + min/max for " << tokens[0] 
+       << "." << tokens[1] << endl;
+  srvo->ExpressionToVector(tokens[0],tokens[1],tokens[2],dummy,dummy,tokens[3]);
   }
 
@@ -1210 +1222 @@
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
 
+kw = "expmeansig";
+usage = "Computes Mean/Sigma (+Min/Max) for an expression X=f(Object)";
+usage += "\n Usage: expmeansig nameobj f_X() [Cut() loop_param]";
+usage += "\n  Related commands: exptovec ntloop fillnt ObjectExpressions ..."; 
+mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
+
 kw = "exptovec";
 usage = "Creates and Fills a Vector with X=f(Object)";
@@ -1215 +1233 @@
 usage += "\n  Related commands: ntloop fillnt ObjectExpressions ..."; 
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
+
 kw = "fillgd1";
 usage = "Creates and Fills a GeneralFitData with (X=f(Object), Y=g(...), ErrY=h(...))";

trunk/SophyaPI/PIext/servnobjm.cc

@@ -26 +26 @@
 #include "tmatrix.h"
 #include "tvector.h"
+#include "matharr.h"
 #include "pitvmaad.h"
 #endif
@@ -817 +818 @@
   }
 delete nt;
-MyObjMgr()->AddObj(vec, nomvec); 
-MyObjMgr()->DisplayObj(nomvec, dopt);
+if (nomvec.size() > 0) {
+  MyObjMgr()->AddObj(vec, nomvec); 
+  MyObjMgr()->DisplayObj(nomvec, dopt);
+}
+else {
+// On calcule et on affiche mean/sigma + min/max 
+  double min, max, mean, sigma;
+  vec->MinMax(min, max);
+  MathArray<r_8> ma;
+  ma.MeanSigma(*vec, mean, sigma);
+  cout << " Mean= " << mean << "  Sigma= " << sigma 
+       << "  Min= " << min << " Max= " << max << endl;
+  delete vec;
+}
 return;  
 }