Changeset 2792 in Sophya for trunk/SophyaPI/PIext/pawexecut.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/pawexecut.cc (modified) (7 diffs)

trunk/SophyaPI/PIext/pawexecut.cc

@@ -13 +13 @@
 #include "histerr.h"
 #include "ntuple.h"
+#include "datatable.h"
 
 #include "pawexecut.h"
@@ -99 +100 @@
 
 kw = "n/read";
-usage = "Read columns in an ASCII file and fill a NTuple";
+usage = "Read columns in an ASCII file and fill a NTuple or a DataTable";
 usage += "\n n/read nt fascii [options] var_1,c_1 var_2,c_2 ... var_n,c_n ";
-usage += "\n var_i,c_i : ntuple variable name, associated column in ASCII file [0,n[";
+usage += "\n nt : NTuple or DataTable (see options) name";
+usage += "\n var_i,c_i : variable name, associated column in ASCII file [0,n[";
 usage += "\n where [options] are:";
+usage += "\n   \"-dt\": create a DataTable of double instead of a NTuple";
 usage += "\n   \"=s\": separator character is \'s\' (could be \"\t\")";
 usage += "\n   \"-^abcd\": do not read lines beginning with string \"abcd\" ";
@@ -655 +658 @@
  string nament = tokens[0];
  string nameascii = tokens[1];
+ bool create_datatable = false;
  vector<string> donotreadbeg;
  vector<string> donotreadin;
@@ -667 +671 @@
    int lc = tokens[i].size();
    if(lc<2) continue;
+   if(tokens[i].find("-dt")==0) { // create DataTable instead of NTuple
+     create_datatable = true;
+     continue;
+   }
    const char *c = tokens[i].c_str();
    if(c[0]=='=') { // Separator
@@ -739 +747 @@
  }
 
- // Creation du NTuple
- char** ntvn = new char*[nvar];
- for(int i=0;i<nvar;i++) ntvn[i] = const_cast<char *>(varname[i].c_str());
+ // Creation du NTuple ou de la DataTable
+ NTuple *nt = NULL;
+ DataTable *dt = NULL;
+ if(!create_datatable) { //create NTuple
+   char** ntvn = new char*[nvar];
+   for(int i=0;i<nvar;i++) ntvn[i] = const_cast<char *>(varname[i].c_str());
+   nt = new NTuple(nvar,ntvn);
+   delete [] ntvn;
+ } else { //create DataTable
+   dt = new DataTable();
+   for(int i=0;i<nvar;i++) dt->AddDoubleColumn(varname[i]);
+ }
  r_8 *xnt = new r_8[nvar];
- NTuple *nt = new NTuple(nvar,ntvn);
 
  // Read file
@@ -808 +824 @@
    if(lvs<numcolmaxi) continue; // Pas assez de champs decodes, mauvaise ligne
 
-   // Remplissage du NTuple
+   // Remplissage du NTuple ou de la DataTable
    for(int i=0;i<nvar;i++) {
      xnt[i] = 0.;
@@ -815 +831 @@
      xnt[i] = atof(vs[ic].c_str());
    }
-   nt->Fill(xnt);
+   if(nt)      nt->Fill(xnt);
+   else if(dt) dt->Fill(xnt);
    //cout<<"...xnt"; for(int i=0;i<nvar;i++) cout<<" "<<xnt[i]; cout<<endl;
 
  }
+ int_4 nentries = (nt)? nt->NEntry(): dt->NEntry();
  cout<<"n_read: "<<nline<<" lines in file, "
      <<nlinecom<<" commentary, "
-     <<nt->NEntry()<<" Ntuple entries"<<endl;
-
- // On sauve le NTuple si besoin, on ferme et detruit ce qu'il faut
+     <<nentries<<" object entries"<<endl;
+
+ // On sauve le NTuple/DataTable si besoin, on ferme et detruit ce qu'il faut
  NamedObjMgr omg;
- if(nt->NEntry()>0) omg.AddObj(nt,nament); else delete nt;
- delete [] ntvn;
+ if(nentries>0) {
+   if(nt) omg.AddObj(nt,nament);
+   if(dt) omg.AddObj(dt,nament);
+ } else {
+   if(nt) delete nt;
+   if(dt) delete dt;
+ }
  delete [] xnt;
  delete [] line;