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

Timestamp:

Jun 1, 2005, 3:24:48 PM (20 years ago)

Author:

cmv

Message:

spiapp cmd "newdt" pour creer une DataTable
spiapp cmd "n/read" modifier pour remplir aussi des DataTable (option -dt)
NtFromASCIIFile modifier pour remplir aussi des DataTable

mais le decodage FillFromASCII de la classe DataTAble est encore a faire

cmv 01/06/2005

File:

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

trunk/SophyaPI/PIext/basexecut.cc

@@ -22 +22 @@
 #include "ntuple.h"
 #include "generaldata.h"
+#include "datatable.h"
 
 #ifdef SANS_EVOLPLANCK
@@ -284 +285 @@
   mObjMgr->AddObj(nt,tokens[0]);
   }
+
+// Creation de DataTable
+else if (kw == "newdt") {
+  if(tokens.size() < 2)
+    {cout<<"Usage: newdt name v1:t1 v2:t2 ... vn:tn / newdt name nvar"<<endl; return(0);}
+  DataTable* dt = new DataTable();
+  const char *c = tokens[1].c_str();
+  if(isdigit(c[0])) {
+    int n = atoi(tokens[1].c_str());
+    if(n<=0 || n>=10000) {
+      cout<<"newdt name nvar : nvar="<<n<<" must be an positive integer<10000"<<endl;
+      delete dt; return(0);
+    }
+    for(int i=0;i<n;i++) {
+      char str[16]; sprintf(str,"v%d",i);
+      dt->AddDoubleColumn(str);
+    }
+  } else {
+    for(int i=1;i<tokens.size();i++) {
+      string vname = tokens[i];
+      uint_4 p = tokens[i].find(':');
+      if(p<tokens[i].size()) vname = vname.substr(0,p);
+      if(vname.size()<1) {
+        cout<<"Zero size name for variable: tokens["<<i<<"]="<<tokens[i]<<endl;
+        delete dt; return(0);
+      }
+      if     (tokens[i].find(":r4")<tokens[i].size()) dt->AddFloatColumn(vname);
+      else if(tokens[i].find(":r8")<tokens[i].size()) dt->AddDoubleColumn(vname);
+      else if(tokens[i].find(":i4")<tokens[i].size()) dt->AddIntegerColumn(vname);
+      else if(tokens[i].find(":i8")<tokens[i].size()) dt->AddLongColumn(vname);
+      else if(tokens[i].find(":s") <tokens[i].size()) dt->AddStringColumn(vname);
+      else                                            dt->AddDoubleColumn(vname);
+    }
+  }
+  mObjMgr->AddObj(dt,tokens[0]);
+}
 
 // Creation de GeneralFitData
@@ -889 +926 @@
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
 kw = "ntfrascii";
-usage = "Fills an existing NTuple from ASCII table file";
+usage = "Fills an existing NTuple or DataTable from ASCII table file";
 usage += "\n Usage: ntfrascii nt_name file_name [def_init_val]";
 usage += "\n  Related commands: ntloop fillnt ";
@@ -982 +1019 @@
 kw = "newh1d";
 usage = "Creates a 1D histogramm \n Usage: newh1d name xmin xmax nbin";
-usage += "\n  Related commands: newh2d  newprof[e] newnt  newgfd ";  
+usage += "\n  Related commands: newh2d  newprof[e] newdt newnt  newgfd ";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newh2d";
 usage = "Creates a 2D histogramm \n Usage: newh2d name xmin xmax nbinx ymin ymax nbiny";
-usage += "\n  Related commands: newh1d  newprof[e] newnt  newgfd ";  
+usage += "\n  Related commands: newh1d  newprof[e] newdt newnt  newgfd ";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newprof";
 usage = "Creates a profile histogramm \n Usage: newprof name xmin xmax nbin [ymin ymax]";
 usage += "\n  Errors represent the data spread in the X bin ";  
-usage += "\n  Related commands: newh1d  newh2d newprofe newnt newgfd ";  
+usage += "\n  Related commands: newh1d  newh2d newprofe newdt newnt newgfd ";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newprofe";
 usage = "Creates a profile histogramm \n Usage: newprofe name xmin xmax nbin [ymin ymax]";
 usage += "\n  Errors represent the error on the data mean in the X bin ";  
-usage += "\n  Related commands: newh1d  newh2d newprof newnt newgfd ";  
+usage += "\n  Related commands: newh1d  newh2d newprof newdt newnt newgfd ";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newnt";
 usage = "Creates a ntuple \n Usage: newnt name v1 v2 v3 .. vn";
 usage += "\n        newnt name nvar";  
-usage += "\n  Related commands: newh1d  newh2d newprof[e] newgfd ";  
+usage += "\n  Related commands: newdt newh1d  newh2d newprof[e] newgfd ";  
+mpiac->RegisterCommand(kw, usage, this, "Objects");
+kw = "newdt";
+usage = "Creates a datatable \n Usage: newdt name v1:t1 v2:t2 v3:t3 .. vn:tn";
+usage += "\n        newdt name nvar";  
+usage += "\n    vi : variable name";  
+usage += "\n    ti : variable type";  
+usage += "\n         r8,r4 for 8 and 4 bytes float";  
+usage += "\n         i8,i4 for 8 and 4 bytes signed integer";  
+usage += "\n         s for string";  
+usage += "\n  Related commands: newnt newh1d  newh2d newprof[e] newgfd";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newgfd";
 usage = "Creates GeneralFit Data object \n Usage: newgfd nvar nalloc [errx(0/1)]";
-usage += "\n  Related commands: newh1d  newh2d  newprof[e] newnt ";  
+usage += "\n  Related commands: newh1d  newh2d  newprof[e] newdt newnt ";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
 kw = "newvec";