Changeset 3112 in Sophya

Timestamp:

Dec 1, 2006, 10:06:37 AM (19 years ago)

Author:

cmv

Message:

ajout constructeur NTuple avec vector<string> cmv 01/12/2006

Location:

trunk/SophyaLib/HiStats

Files:

• ntuple.cc (modified) (2 diffs)
• ntuple.h (modified) (1 diff)

trunk/SophyaLib/HiStats/ntuple.cc

@@ -81 +81 @@
 //
 //      Createur d'un ntuple de `nvar' variables dont les
-//      noms sont dans le tableau de cahines de caracteres `noms'
+//      noms sont dans le tableau de chaines de caracteres `noms'
 //      avec `blk' d'evenements par blocks.
 //--
@@ -89 +89 @@
 mVarD = NULL;
 mInfo = NULL;
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
+mNVar = nvar;
+mVar = new r_4[nvar];
+mVarD = new r_8[nvar];
+if (blk < 10) blk = 10;
+mBlk = blk;
+
+if (fgdouble) {
+  r_8* pt = new r_8[nvar*blk];
+  mNBlk = 1;
+  mPtrD.push_back(pt);
+  mFgDouble = true;
+}
+else { 
+  r_4* pt = new r_4[nvar*blk];
+  mNBlk = 1;
+  mPtr.push_back(pt);
+  mFgDouble = false;
+}
+for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+return;
+}
+
+//! Constructor with specification of number of columns and column name
+/*!
+  \param noms : Array of column names (length(name) < 8 characters) 
+  \param blk : Optional argument specifying number of table lines
+  in a given data block
+  \param fgdouble : if \b true: internal data kept as double precision values (r_8),
+  simple precision (r_4) otherwise
+ */
+NTuple::NTuple(vector<string>& noms, int blk, bool fgdouble)
+{
+mNVar = mNEnt = mBlk = mNBlk = 0;
+mVar = NULL;
+mVarD = NULL;
+mInfo = NULL;
+int nvar = noms.size();
 if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
 mNVar = nvar;

trunk/SophyaLib/HiStats/ntuple.h

@@ -26 +26 @@
 
 public:
-                    NTuple();
-                    NTuple(int nvar, char** noms, int blk=512, bool fgdouble=true);
-                    NTuple(const NTuple& NT);
-  virtual           ~NTuple();
+  NTuple();
+  NTuple(int nvar, char** noms, int blk=512, bool fgdouble=true);
+  NTuple(vector<string>& noms, int blk=512, bool fgdouble=true);
+  NTuple(const NTuple& NT);
+  virtual ~NTuple();
 
-  NTuple&           operator = (const NTuple& NT);
+  NTuple& operator = (const NTuple& NT);
  
   void              Fill(r_4* x);