Changeset 3572 in Sophya for trunk/SophyaLib/HiStats/ntuple.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

• trunk/SophyaLib/HiStats/ntuple.cc (modified) (8 diffs)

trunk/SophyaLib/HiStats/ntuple.cc

@@ -26 +26 @@
    #include "ntuple.h"
    // ...
-   char * names[3] = {"XPos", "YPos", "Val"};
+   const char * names[3] = {"XPos", "YPos", "Val"};
    // NTuple (Table) creation with 3 columns (double precision)
    NTuple  nt(3, names);
@@ -73 +73 @@
 
 
-//! Constructor with specification of number of columns and column name
+//! Constructor with specification of number of columns and column names
 /*!
   \param nvar : Number of columns in the table 
-  \param noms : Array of column names (length(name) < 8 characters) 
+  \param noms : Array of column names
   \param blk : Optional argument specifying number of table lines
   in a given data block
@@ -90 +90 @@
 //--
 {
-mNVar = mNEnt = mBlk = mNBlk = 0;
-mVar = NULL;
-mVarD = NULL;
-mInfo = NULL;
-mThS = 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;
-}
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with char** noms"); 
+Initialize(nvar,blk,fgdouble);
 for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
 return;
 }
 
-//! Constructor with specification of number of columns and column name
+
+//! Constructor with specification of number of columns and column names
+/*!
+  \param nvar : Number of columns in the table 
+  \param noms : Array of column names
+  \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(int nvar, const char** noms, int blk, bool fgdouble)
+//
+//      Createur d'un ntuple de `nvar' variables dont les
+//      noms sont dans le tableau de chaines de caracteres `noms'
+//      avec `blk' d'evenements par blocks.
+//--
+{
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with const char** noms"); 
+Initialize(nvar,blk,fgdouble);
+for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+return;
+}
+
+//! Constructor with specification of number of columns and column names as a string vector
 /*!
   \param noms : Array of column names (length(name) < 8 characters) 
@@ -128 +130 @@
 NTuple::NTuple(vector<string>& noms, int blk, bool fgdouble)
 {
+int nvar = noms.size();
+if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) with vector<string>& noms");
+Initialize(nvar,blk,fgdouble);
+for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+return;
+}
+
+
+/* --Methode-- */
+/* Initialisation pour Createurs (fonction privee) */
+void NTuple::Initialize(int nvar, int blk, bool fgdouble)
+{
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
@@ -133 +147 @@
 mInfo = NULL;
 mThS = NULL; 
-int nvar = noms.size();
-if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
 mNVar = nvar;
 mVar = new r_4[nvar];
@@ -153 +165 @@
   mFgDouble = false;
 }
-for(int i=0; i<nvar; i++) mNames.push_back(noms[i]);
+
 return;
 }
@@ -206 +218 @@
 Clean();
 }
+
 /* --Methode-- */ 
 /*!
@@ -494 +507 @@
 //--
 {
-char * tt = "float"; 
+const char * tt = "float"; 
 if (mFgDouble) tt = "double";
 os << "NTuple T=" << tt << " : NVar= " << mNVar << " NEnt=" << mNEnt