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

Timestamp:

Jul 21, 2003, 11:13:10 PM (22 years ago)

Author:

cmv

Message:

• introduction notion de numero de ligne dans expression ntuple modif prototype PlotExprFunc NTLoopExprFunc (add _nl _nstart _nend) modif int_4 -> int_8_exprf (long long) pour _nl (DecodeLoopParameters,

PrepareNTExpressionCFile, LinkExprFunc,...)

• doc pour _nl _nstart _nend et arragement repartition RegisterHelp/RegisterCommand

(rz + cmv 21/7/2003)

File:

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

trunk/SophyaPI/PIext/basexecut.cc

@@ -581 +581 @@
     return(0);
   }
-  int kks = 0;
-  int kke = v->NElts();
-  int kkp = 1;
+  int_8 kks = 0;
+  int_8 kke = v->NElts();
+  int_8 kkp = 1;
   if (tokens.size() > 2) Services2NObjMgr::DecodeLoopParameters(tokens[2], kks, kke, kkp);
   if (kks < 0)  kks = 0;
-  if (kke > v->NElts()) kke = v->NElts();
+  if (kke > (int_8)v->NElts()) kke = v->NElts();
   if (kkp < 1) kkp = 1;
   int nelt = (kke-kks-1)/kkp;
@@ -646 +646 @@
       return(0);
     }
-    int kks = 0;
-    int kke = nti->NbLines();
-    int kkp = 1;
+    int_8 kks = 0;
+    int_8 kke = nti->NbLines();
+    int_8 kkp = 1;
     if (tokens.size() > 3) Services2NObjMgr::DecodeLoopParameters(tokens[3], kks, kke, kkp);
     if (kks < 0)  kks = 0;
-    if (kke > nti->NbLines()) kke = nti->NbLines();
+    if (kke > (int_8)nti->NbLines()) kke = nti->NbLines();
     if (kkp < 1) kkp = 1;
     int nelt = (kke-kks-1)/kkp;
@@ -1070 +1070 @@
 void PIABaseExecutor::RegisterCommands()
 {
-string kw, usage;
+string kw, usage, grp;
 kw = "loadmodule";
 usage = "To load and initialize modules \n  Usage: loadmodule fnameso modulename";
@@ -1614 +1614 @@
 usage = "Any mathematical expression (math.h) with object variables can be used";
 usage += "\n  ------ Object Variable names (double) -------- ";
-usage += "\n- NTuple: ntuple variable names";
-usage += "\n- Histo1D/HProf: i,x,val,err";
-usage += "\n- Histo2D: i,j,x,y,val,err";
-usage += "\n- Vector/Matrix: n,r,c,val,real,imag,mod,phas";
-usage += "\n- TArray: n,x,y,z,t,u,val,real,imag,mod,phas";
-usage += "\n- Image: i,j,x,y,val(=pix)";
-usage += "\n- GeneralFitData: x0,ex0 x1,ex1 ...  xn,exn   y,ey   ok";
+usage += "\n  (_nl is the table line number or the sequential index)";
+usage += "\n- NTuple: ntuple variable names,_nl";
+usage += "\n- Histo1D/HProf: i,x,val,err,_nl";
+usage += "\n- Histo2D: i,j,x,y,val,err,_nl";
+usage += "\n- Vector/Matrix: n,r,c,val,real,imag,mod,phas,_nl";
+usage += "\n- TArray: n,x,y,z,t,u,val,real,imag,mod,phas,_nl";
+usage += "\n- Image: i,j,x,y,val(=pix),_nl";
+usage += "\n- GeneralFitData: x0,ex0 x1,ex1 ...  xn,exn   y,ey   ok  ,_nl";
 usage += "\n- LocalMap/SphereThetaPhi/SphereHEALPix: ";
-usage += "\n-         i,k,val,real,imag,mod,phas,teta,phi";
-usage += "\n- FITS Binary/ASCII table: fits column names";
+usage += "\n-         i,k,val,real,imag,mod,phas,teta,phi,_nl";
+usage += "\n- FITS Binary/ASCII table: fits column names,_nl";
 #ifdef SANS_EVOLPLANCK
 usage += "\n  ------ Eros Variable names (double) -------- ";
 usage += "\n- StarList: x,y,flux,fond,pixmax,flags,";
-usage += "\n-           xref,yref,fluxref,fondref,pixmaxref";
+usage += "\n-           xref,yref,fluxref,fondref,pixmaxref,_nl";
 #endif
 usage += "\n  ------ Other parameters -------- ";
@@ -1635 +1636 @@
 usage += "\n        projh1d projh2d  projprof fillvec fillmtx "; 
 usage += "\n        fillnt fillgd1 fillgd2 ntloop exptovec ... ";
-mpiac->RegisterCommand(kw, usage, NULL, "Expr. Plotting");
+grp = "Expr. Plotting";
+mpiac->RegisterHelp(kw, usage, grp);
 kw = "plot2d";
 usage = "Plots (2D) Y=g(Object) vs. X=f(Object) --- Object Variable names (double) :";