Changeset 3052 in Sophya for trunk/SophyaPI

Timestamp:

Aug 12, 2006, 7:28:18 PM (19 years ago)

Author:

cmv

Message:

nombre entrees ds bin HProf/HistoErr ds Ntuple Interface cmv 12/8/2006

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• nomhistadapter.cc (modified) (4 diffs)
• nomhistadapter.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -1146 +1146 @@
 usage += "\n  (_nl is the table line number or the sequential index)";
 usage += "\n- NTuple: ntuple variable names,_nl";
-usage += "\n- Histo1D/HProf: i,x,val,err,_nl";
+usage += "\n- Histo1D/HProf/HistoErr: i,x,val,err,nb,_nl";
 usage += "\n- Histo2D: i,j,x,y,val,err,_nl";
 usage += "\n- Vector/Matrix: n,r,c,val,real,imag,mod,phas,_nl";

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -223 +223 @@
 NTupInt_Histo::NTupInt_Histo(Histo* h)
 {
-mHis = h;
+mHis  = h;
+mHpr  = dynamic_cast<HProf *>(h);
+mHerr = dynamic_cast<HistoErr *>(h);
 }
 
@@ -240 +242 @@
 sa_size_t NTupInt_Histo::NbColumns() const
 {
-return(4);
+return(5);
 }
 
@@ -248 +250 @@
 int i;
 if ((k < 0) || (k >= mHis->NBins())) 
-    for(i=0; i<4; i++)  mRet[i] = 0.;
+    for(i=0; i<5; i++)  mRet[i] = 0.;
 else { 
   mRet[0] = k;  mRet[1] = mHis->BinCenter(k);
-  mRet[2] = (*mHis)(k); mRet[3] = mHis->Error(k); 
+  mRet[2] = (*mHis)(k); mRet[3] = mHis->Error(k);
+  if(mHerr) mRet[4] = mHerr->NEntBin(k);
+    else if(mHpr) mRet[4] = mHpr->SumW(k);
+      else mRet[4] = 0.;
   }
 return(mRet);
@@ -262 +267 @@
 if (nx) nomx = nx;
 else nomx = "_xh_";
-string vardec = "double i,x,val,err; \n";
+string vardec = "double i,x,val,err,nb; \n";
 vardec += "i = " + nomx + "[0];  x = " + nomx + "[1]; \n";
 vardec += "val = " + nomx + "[2];  err = " + nomx + "[3]; \n";
+vardec += "nb = " + nomx + "[4]; \n";
 return(vardec);
 }

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -64 +64 @@
 protected:
   Histo* mHis;
-  mutable r_8 mRet[4];
+  HProf* mHpr;
+  HistoErr* mHerr;
+  mutable r_8 mRet[5];
 };