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

Timestamp:

Oct 21, 1999, 2:22:56 PM (26 years ago)

Author:

ercodmgr

Message:

Adapatation a NTupleInterface::GetCelltoString() et ajout trace Label ds PINTuple/3D et Wt ds PINtuple3D - Reza 21/10/99

File:

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

trunk/SophyaPI/PIext/basexecut.cc

@@ -340 +340 @@
 
 else if (kw == "nt2d") {
-  if (tokens.size() < 5) { cout << "Usage: nt2d nameobj varx vary errx erry opt" << endl; return(0); }
-  string opt = "n";
-  if (tokens.size() > 5)  opt = tokens[5];
+  if (tokens.size() < 3) { 
+    cout << "Usage: nt2d nameobj varx vary [errx erry wt label opt]" << endl; 
+    return(0); 
+  }
+  while (tokens.size() < 8) tokens.push_back("");
   string ph = "";
-  mObjMgr->DisplayNT(tokens[0],tokens[1],tokens[2], ph, tokens[3], tokens[4], ph, opt);
-  }
-else if (kw == "nt2dw") {
-  if (tokens.size() < 6) { cout << "Usage: nt2dw nameobj varx vary varz errx erry opt" << endl; return(0); }
-  string opt = "n";
-  if (tokens.size() > 6)  opt = tokens[6];
-  string ph = "";
-  mObjMgr->DisplayNT(tokens[0],tokens[1],tokens[2], tokens[3], tokens[4], tokens[5], ph, opt, false);
+  mObjMgr->DisplayNT(tokens[0], tokens[1], tokens[2], ph, tokens[3], tokens[4], ph, 
+                     tokens[5], tokens[6], tokens[7], false);
   }
 else if (kw == "nt3d") {
-  if (tokens.size() < 7) { cout << "Usage: nt3d nameobj varx vary varz errx erry errz opt" << endl; return(0); }
-  string opt = "n";
-  if (tokens.size() > 7)  opt = tokens[7];
-  mObjMgr->DisplayNT(tokens[0],tokens[1],tokens[2], tokens[3], tokens[4], tokens[5], tokens[6], opt, true);
+  if (tokens.size() < 7) { 
+    cout << "Usage: nt3d nameobj varx vary varz [errx erry errz wt label opt]" << endl; 
+    return(0); 
+  }
+  while (tokens.size() < 10) tokens.push_back("");
+  mObjMgr->DisplayNT(tokens[0], tokens[1], tokens[2], tokens[3], tokens[4], tokens[5],
+                     tokens[6], tokens[7], tokens[8], tokens[9], true);
   }
 
@@ -825 +824 @@
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
 kw = "nt2d";
-usage = "Displays Points (X-Y) [with error-bars] from an NTuple ";
-usage += "\n Usage : nt2d nameobj varx vary [errx erry] [graphic_attributes]";
-usage += "\n  Related commands: disp  surf  nt2dw nt3d  gfd2d ";  
-mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
-kw = "nt2dw";
-usage = "Displays Points (X-Y) with weight [with error-bars] from an NTuple ";
-usage += "\n Usage : nt2d nameobj varx vary varz [errx erry] [graphic_attributes]";
-usage += "\n  Related commands: disp  surf  nt2d nt3d  gfd2d ";  
+usage = "Displays Points (X-Y) [with error-bar / Weight / Label ] from an NTuple ";
+usage += "\n Usage : nt2d nameobj varx vary [errx erry wt label graphic_attributes]";
+usage += "\n  Related commands: disp  surf  nt3d  gfd2d ";  
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
 kw = "nt3d";
-usage = "Displays 3D-Points (X-Y-Z) [with error-bars] from an NTuple ";
-usage += "\n Usage : nt3d nameobj varx vary varz [errx erry errz] [graphic_attributes]";
-usage += "\n  Related commands: disp  surf  nt2d nt2dw  gfd3d ";  
-usage += "\n  Related commands: disp  surf  nt2d nt2dw ";  
+usage = "Displays 3D-Points (X-Y-Z) [with error-bars / Weight / Label ] from an NTuple ";
+usage += "\n Usage : nt3d nameobj varx vary varz [errx erry errz wt label graphic_attributes]";
+usage += "\n  Related commands: disp  surf  nt2d gfd3d ";  
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");