Changeset 1035 in Sophya for trunk/SophyaPI/PIext/pawexecut.cc

Timestamp:

Jun 7, 2000, 3:04:24 PM (25 years ago)

Author:

ercodmgr

Message:

• creation comm newprofe pour profile avec erreur sur mean
• correction petit bug n/plot pour increment nom histo 1d paw_n_plot1D_??? dans le cas ou on veut faire

"n/plot ..." puis "n/plot ... same"

cmv 7/6/2000

File:

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

trunk/SophyaPI/PIext/pawexecut.cc

@@ -26 +26 @@
 
 /* Reza + cmv  13/10/99 */
+
+uint_4 PAWExecutor::autoc_counter_ = 0;
 
 /* methode */
@@ -173 +175 @@
 if(tokens.size() < 1) {
   cout
-  <<"Usage: n/plot nameobj.x_exp [cut] [w_exp] [loop] [gratt]"<<endl
+  <<"Usage: n/plot nameobj.x_exp [cut] [w_exp] [loop] [gratt] [nomh1]"<<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
@@ -181 +183 @@
 string nameobj,expx,expy,expz;
 int nvar = decodepawstring(tokens[0],nameobj,expx,expy,expz);
-string expcut = "1"; string expwt = "1."; string loop = ""; string dopt = "";
+string expcut = "1"; string expwt = "1."; string loop = "";
+string dopt = ""; string nameproj="";
 if(tokens.size()>=2) expcut = tokens[1]; if(expcut=="!") expcut="1";
 
@@ -190 +193 @@
   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);
-  //  if(mobj!=NULL) omg.DelObj(nameproj);  $CHECK$ Reza 12/12/99 - clean auto 
+  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]; if(dopt=="!") dopt="";
+  if(tokens.size()>=6) nameproj = tokens[5];
+  if(nameproj.length()<=0 || nameproj=="!") {
+    nameproj = "/autoc/paw_n_plot1D_";
+    AnyDataObj* mobj = omg.GetObj(nameproj);
+    if(mobj!=NULL) {
+      char buff[16]; autoc_counter_++; sprintf(buff,"%d",autoc_counter_);
+      nameproj += buff;
+    }
+  }
   srvo->ProjectH1(nameobj,expx,expwt,expcut,nameproj,dopt,loop);
 } else if(nvar==2) { // c'est un plot 2D