Changeset 326 in Sophya for trunk/SophyaPI/PIext/basexecut.cc

Timestamp:

Jun 23, 1999, 4:41:47 PM (26 years ago)

Author:

ercodmgr

Message:

1/ NTupleInterface mis ds Outils++ et complete -
2/ Les PINtuple et PINtup3D utilisent maintenant NTupleInterface
3/ Debut modification interface NObjMgr - Reza 23/6/99

File:

• trunk/SophyaPI/PIext/basexecut.cc (modified) (5 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -13 +13 @@
 #include "pistdimgapp.h"
 #include "nobjmgr.h"
+#include "servnobjm.h"
 
 #include "histos.h"
@@ -252 +253 @@
   np = atoi(tokens[3].c_str());
   xmin = atof(tokens[1].c_str());   xmax = atof(tokens[2].c_str());
-  mObjMgr->PlotFunc(tokens[0], xmin, xmax, np, opt); 
+  mObjMgr->GetServiceObj()->PlotFunc(tokens[0], xmin, xmax, np, opt); 
+  }
+else if ( (kw == "funcff") ) {
+  if (tokens.size() < 5) { cout << "Usage: funcff C-filename f(x)-name xmin xmax npt [opt]" << endl; return(0); }
+  string opt = "n";
+  if (tokens.size() > 5)  opt = tokens[5];
+  int np;
+  float xmin, xmax;
+  np = 100;
+  xmin = 0.;  xmax = 1.;
+  np = atoi(tokens[4].c_str());
+  xmin = atof(tokens[2].c_str());   xmax = atof(tokens[3].c_str());
+  mObjMgr->GetServiceObj()->PlotFuncFrCFile(tokens[0], tokens[1], xmin, xmax, np, opt); 
   }
 else if ( (kw == "func2d") ) {
@@ -271 +284 @@
   string opt = "n";
   if (tokens.size() > 7)  opt = tokens[7];
-  mObjMgr->PlotFunc2D(tokens[0], xmin, xmax, ymin, ymax, npx, npy, opt);
+  mObjMgr->GetServiceObj()->PlotFunc2D(tokens[0], xmin, xmax, ymin, ymax, npx, npy, opt);
+  }
+else if ( (kw == "func2dff") ) {
+  if (tokens.size() < 8) {
+    cout << "Usage: func2d C-filename F(x,y)-name xmax nptx ymin ymax npty opt" << endl;
+    return(0);
+    }
+  int npx, npy;
+  float xmin, xmax;
+  float ymin, ymax;
+  npx = npy = 50;
+  xmin = 0.;  xmax = 1.;
+  ymin = 0.;  ymax = 1.;
+  npx = atoi(tokens[4].c_str());
+  npy = atoi(tokens[7].c_str());
+  xmin = atof(tokens[2].c_str());   xmax = atof(tokens[3].c_str());
+  ymin = atof(tokens[5].c_str());   ymax = atof(tokens[6].c_str());
+  string opt = "n";
+  if (tokens.size() > 8)  opt = tokens[8];
+  mObjMgr->GetServiceObj()->PlotFunc2DFrCFile(tokens[0], tokens[1], xmin, xmax, ymin, ymax, npx, npy, opt);
   }
 
@@ -551 +583 @@
 usage = "Displays a function y=f(x) (Fills a vector with function values)";
 usage += "\n Usage: func f(x) xmin xmax npt [graphic_attributes]";
-usage += "\n  Related commands: func2d ";  
+usage += "\n  Related commands: funcff func2d func2dff ";  
+mpiac->RegisterCommand(kw, usage, this);
+kw = "funcff";
+usage = "Displays a function y=f(x) from a C-file (Fills a vector with function values)";
+usage += "\n Usage: funcff C-FileName FunctionName xmin xmax npt [graphic_attributes]";
+usage += "\n  Related commands: func func2d func2dff ";  
 mpiac->RegisterCommand(kw, usage, this);
 kw = "func2d";
@@ -557 +594 @@
 usage += "\n Usage: func2d f(x,y) xmin xmax nptx ymin ymax npty [graphic_attributes]";
 usage += "\n  Related commands: func";  
+mpiac->RegisterCommand(kw, usage, this);
+kw = "func2dff";
+usage = "Displays a function z=f(x,y) from a C-file (Fills a matrix with function values)";
+usage += "\n Usage: func2dff C-FileName FunctionName xmin xmax nptx ymin ymax npty [graphic_attributes]";
+usage += "\n  Related commands: func funcff func2d ";  
 mpiac->RegisterCommand(kw, usage, this);