Changeset 469 in Sophya for trunk

Timestamp:

Oct 15, 1999, 3:24:20 PM (26 years ago)

Author:

ercodmgr

Message:

add loop to n/plot n/proj cmv 15/10/99

File:

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

trunk/SophyaPI/PIext/pawexecut.cc

@@ -34 +34 @@
 
 kw = "n/plot";
-usage = "Plot NTuple variable a la paw";
-usage += "\n n/plot nameobj.x_exp [cut] [w_exp] [gratt]";
-usage += "\n n/plot nameobj.y_exp%x_exp [cut] [w_exp] [gratt]";
-usage += "\n n/plot nameobj.z_exp%y_exp%x_exp [cut] [gratt]";
+usage = "Plot NTuple variables a la paw";
+usage += "\n n/plot nameobj.x_exp [cut] [w_exp] [loop] [gratt]";
+usage += "\n n/plot nameobj.y_exp%x_exp [cut] [loop] [gratt]";
+usage += "\n n/plot nameobj.z_exp%y_exp%x_exp [cut] [loop] [gratt]";
+usage += "\n        for default use ! , loop=i1[:i2[:di]]";
 usage += "\n  Related commands: plot2dw plot3d";  
 piac->RegisterCommand(kw,usage,this,hgrp);
@@ -43 +44 @@
 kw = "n/proj";
 usage = "Project NTuple in histogram (1D or 2D) a la paw";
-usage += "\n n/proj nameproj nameobj.x_exp [cut] [w_exp] [gratt]";
-usage += "\n n/proj nameproj nameobj.y_exp%x_exp [cut] [w_exp] [gratt]";
+usage += "\n n/proj nameproj nameobj.x_exp [cut] [w_exp] [loop] [gratt]";
+usage += "\n n/proj nameproj nameobj.y_exp%x_exp [cut] [w_exp] [loop] [gratt]";
+usage += "\n        for default use ! , loop=i1[:i2[:di]]";
 usage += "\n  Related commands: projh1d projh2d projprof";  
 piac->RegisterCommand(kw,usage,this,hgrp);
@@ -125 +127 @@
 {
 if(tokens.size() < 1)
-  {cout<<"Usage: reset nameobj"<<endl;
-  return;}
+  {cout<<"Usage: reset nameobj"<<endl; return;}
 NamedObjMgr omg;
 AnyDataObj* mobj = omg.GetObj(tokens[0]);
@@ -159 +160 @@
 if(tokens.size() < 1) {
   cout
-  <<"Usage: n/plot nameobj.[z_exp%y_exp%]x_exp [cut] [w_exp] [gratt]"<<endl
-  <<"       n/plot nameobj.z_exp%y_exp%x_exp [cut] [gratt]"<<endl;
+  <<"Usage: n/plot nameobj.x_exp [cut] [w_exp] [loop] [gratt]"<<endl
+  <<"       n/plot nameobj.y_exp%x_exp [cut] [loop] [gratt]"<<endl
+  <<"       n/plot nameobj.z_exp%y_exp%x_exp [cut] [loop] [gratt]"<<endl
+  <<"              for default use ! , loop=i1[:i2[:di]]"<<endl;
   return;
 }
 string nameobj,expx,expy,expz;
 int nvar = decodepawstring(tokens[0],nameobj,expx,expy,expz);
-string expcut = "1";
-string expwt = "1.";
-string dopt = "";
-string loop = "";
-if(tokens.size()>=2) expcut = tokens[1];
-if(tokens.size()>=3) expwt  = tokens[2];
-if(tokens.size()>=4) dopt   = tokens[3];
-
+string expcut = "1"; string expwt = "1."; string loop = ""; string dopt = "";
+if(tokens.size()>=2) expcut = tokens[1]; if(expcut=="!") expcut="1";
 
 NamedObjMgr omg;
@@ -180 +177 @@
   cout<<"PAWExecutor::n_plot Error: bad coding "<<tokens[0]<<endl;
 } else if(nvar==1) { // c'est un plot 1D
+  if(tokens.size()>=3) expwt = tokens[2]; if(expwt=="!") expwt="1.";
+  if(tokens.size()>=4) loop  = tokens[3]; if(loop=="!") loop="";
+  if(tokens.size()>=5) dopt  = tokens[4];
   string nameproj = "/autoc/paw_n_plot1D";
   AnyDataObj* mobj = omg.GetObj(nameproj);
@@ -185 +185 @@
   srvo->ProjectH1(nameobj,expx,expwt,expcut,nameproj,dopt,loop);
 } else if(nvar==2) { // c'est un plot 2D
-  srvo->DisplayPoints2DW(nameobj,expx,expy,expwt,expcut,dopt,loop);
+  if(tokens.size()>=3) loop = tokens[2]; if(loop=="!") loop="";
+  if(tokens.size()>=4) dopt = tokens[3];
+  string err = "";
+  srvo->DisplayPoints2D(nameobj,expx,expy,err,err,expcut,dopt,loop);
 } else {             // c'est un plot 3D
+  if(tokens.size()>=3) loop = tokens[2]; if(loop=="!") loop="";
+  if(tokens.size()>=4) dopt = tokens[3];
   srvo->DisplayPoints3D(nameobj,expx,expy,expz,expcut,dopt,loop);
 }
@@ -203 +208 @@
 {
 if(tokens.size()<2)
-  {cout<<"Usage: n/proj nameproj nameobj.[y_exp%]x_exp [cut] [w_exp] [gratt]"<<endl;
-  return;}
+  {cout<<"Usage: n/proj nameproj nameobj.[y_exp%]x_exp [cut] [w_exp] [loop] [gratt]"<<endl
+       <<"              for default use ! , loop=i1[:i2[:di]]"<<endl; return;}
 string nameproj = tokens[0];
 string nameobj,expx,expy,expz;
 int nvar = decodepawstring(tokens[1],nameobj,expx,expy,expz);
-string expcut = "1";
-string expwt = "1.";
-string dopt = "";
-string loop = "";
-if(tokens.size()>=3) expcut = tokens[2];
-if(tokens.size()>=4) expwt  = tokens[3];
-if(tokens.size()>=5) dopt   = tokens[4];
+string expcut = "1"; string expwt = "1."; string loop = ""; string dopt = "";
+if(tokens.size()>=3) expcut = tokens[2]; if(expcut=="!") expcut="1";
+if(tokens.size()>=4) expwt  = tokens[3]; if(expwt=="!") expwt="1.";
+if(tokens.size()>=5) loop   = tokens[4]; if(loop=="!") loop="";
+if(tokens.size()>=6) dopt   = tokens[5];
 
 NamedObjMgr omg;