Changeset 1091 in Sophya for trunk/SophyaPI

Timestamp:

Jul 26, 2000, 3:15:43 PM (25 years ago)

Author:

ercodmgr

Message:

Histos/Hprof/Histo2D en r_8 cmv 26/7/00

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (4 diffs)
• nomhistadapter.cc (modified) (1 diff)
• pawexecut.cc (modified) (14 diffs)
• piafitting.cc (modified) (1 diff)
• piafitting.h (modified) (3 diffs)
• pihisto2d.cc (modified) (1 diff)
• servnobjm.cc (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -210 +210 @@
 else if (kw == "newh1d") {
   if (tokens.size() < 4) { cout << "Usage: newh1d name xmin xmax nbin" << endl; return(0); }
-  int nbx;
-  float xmin, xmax;
-  nbx = 100;
-  xmin = 0.;  xmax = 1.;
+  int_4 nbx = 100;
+  r_8 xmin = 0., xmax = 1.;
   nbx = atoi(tokens[3].c_str());
   xmin = atof(tokens[1].c_str());   xmax = atof(tokens[2].c_str());
@@ -224 +222 @@
     return(0); 
     }
-  int nbx, nby;
-  float xmin, xmax;
-  float ymin, ymax;
-  nbx = nby = 50;
-  xmin = 0.;  xmax = 1.;
-  ymin = 0.;  ymax = 1.;
+  int_4 nbx = 50, nby = 50;
+  r_8 xmin = 0., xmax = 1.;
+  r_8 ymin = 0., ymax = 1.;
   nbx = atoi(tokens[3].c_str());
   nby = atoi(tokens[6].c_str());
@@ -240 +235 @@
   if (tokens.size() < 4)
     { cout << "Usage: newprof[e] name xmin xmax nbin [ymin ymax]" << endl; return(0); }
-  int nbx;
-  float xmin, xmax, ymin = 1., ymax = -1.;
+  int_4 nbx = 100;
+  r_8 xmin = 0., xmax = 1., ymin = 1., ymax = -1.;
   if(tokens.size() > 5)
     {ymin = atof(tokens[4].c_str());   ymax = atof(tokens[5].c_str());}
-  nbx = 100;
-  xmin = 0.;  xmax = 1.;
   nbx = atoi(tokens[3].c_str());
   xmin = atof(tokens[1].c_str());   xmax = atof(tokens[2].c_str());
@@ -546 +539 @@
   while (tokens.size() < 8) tokens.push_back("");
   srvo->ProjectHProf(tokens[1], tokens[2], tokens[3], tokens[4], tokens[5], tokens[0],
-                    tokens[6], tokens[7] );
+                     tokens[6], tokens[7] );
   }
 

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -232 +232 @@
 {
 int i,j;
-float f2,f3;
+r_8 f2,f3;
 if ((n < 0) || (n >= mHis->NBinX()*mHis->NBinY())) 
     for(i=0; i<6; i++)  mRet[i] = 0.;

trunk/SophyaPI/PIext/pawexecut.cc

@@ -368 +368 @@
   {cout<<"PAWExecutor::h_integ Error: unknow object"<<tokens[0]<<endl;
   return;}
-double norm = 1.;
+r_8 norm = 1.;
 if(tokens.size()>=2) norm = atof(tokens[1].c_str());
 // attention: dynamic_cast<Histo*>(HProf)=Vrai!
@@ -410 +410 @@
   {cout<<"PAWExecutor::h_rebin Error: unknow object"<<tokens[0]<<endl;
   return;}
-int nbin = atoi(tokens[1].c_str());
+int_4 nbin = atoi(tokens[1].c_str());
 Histo* h1 = dynamic_cast<Histo*>(mobj);
 // Ca marche aussi pour les HProf, HRebin a ete passe virtuel
@@ -431 +431 @@
   {cout<<"PAWExecutor::h_cadd Error: unknow object"<<tokens[0]<<endl;
   return;}
-double val = atof(tokens[1].c_str());
+r_8 val = atof(tokens[1].c_str());
 Histo*   h1 = dynamic_cast<Histo*>(mobj);
 HProf*   hp = dynamic_cast<HProf*>(mobj);
@@ -455 +455 @@
   {cout<<"PAWExecutor::h_cmult Error: unknow object"<<tokens[0]<<endl;
   return;}
-double val = atof(tokens[1].c_str());
+r_8 val = atof(tokens[1].c_str());
 Histo*   h1 = dynamic_cast<Histo*>(mobj);
 HProf*   hp = dynamic_cast<HProf*>(mobj);
@@ -703 +703 @@
   if(tokens.size()<3)
     {cout<<"Usage: h/plot/2d nameh2d bx/by/sx/sy n [dopt]"<<endl; return;}
-  int n = atoi(tokens[2].c_str());
+  int_4 n = atoi(tokens[2].c_str());
   dopt = ""; if(tokens.size()>=4) dopt = tokens[3];
   if(proj == "bx") {
@@ -848 +848 @@
    return;}
 string proj = "h";  if(tokens.size()>3) proj = tokens[3];
-int nproj = -1;     if(tokens.size()>4) nproj = atoi(tokens[4].c_str());
+int_4 nproj = -1;   if(tokens.size()>4) nproj = atoi(tokens[4].c_str());
 string hname = tokens[0];
 string vname = tokens[1];
@@ -988 +988 @@
   Histo* v2 = NULL;
   if(mobjv2==NULL)
-    {v2 = new Histo(0.,(float)(i2-i1+1),i2-i1+1);
+    {v2 = new Histo(0.,(r_8)(i2-i1+1),i2-i1+1);
      omg.AddObj(v2,tokens[1]); mobjv2 = omg.GetObj(tokens[1]);}
   if(typeid(*mobjv2) != typeid(Histo))
@@ -1050 +1050 @@
   Histo2D* v2 = NULL;
   if(mobjv2==NULL)
-    {v2 = new Histo2D(0.,(float)(i2-i1+1),i2-i1+1,0.,(float)(j2-j1+1),j2-j1+1);
+    {v2 = new Histo2D(0.,(r_8)(i2-i1+1),i2-i1+1,0.,(r_8)(j2-j1+1),j2-j1+1);
      omg.AddObj(v2,tokens[1]); mobjv2 = omg.GetObj(tokens[1]);}
   if(typeid(*mobjv2) != typeid(Histo2D))
@@ -1096 +1096 @@
 // Decodage arguments
 bool replerr = false; if(dum=="err") replerr = true;
-float setval = (float) atof(tokens[1].c_str());
+r_8 setval = atof(tokens[1].c_str());
 int testcont=0; if(tokens[2]=="v") testcont=1; if(tokens[2]=="e") testcont=2;
 int_4 i1=-1, i2=-1, j1=-1, j2=-1;
-float v1=0., v2=0.;
+r_8 v1=0., v2=0.;
 if(testcont==0) {
   sscanf(tokens[2].c_str(),"%d:%d",&i1,&i2);
@@ -1107 +1107 @@
     {cout<<"PAWExecutor::h_set Error: h/set/... v v1:v2, please give v1:v2"<<endl;
     return;}
-  sscanf(tokens[3].c_str(),"%f:%f",&v1,&v2);
+  sscanf(tokens[3].c_str(),"%lf:%lf",&v1,&v2);
 }
 
@@ -1130 +1130 @@
     {cout<<"PAWExecutor::h_set Error: bad bin range i1="<<i1<<endl; return;}
   if(i2<i1) i2=i1; if(i2>=h->NBins()) i2=h->NBins()-1;
-  for(int i=i1;i<=i2;i++) {
+  for(int_4 i=i1;i<=i2;i++) {
     bool change = true;
     if(testcont==1) {if((*h)(i)<v1 || (*h)(i)>v2) change = false;}
@@ -1147 +1147 @@
   if(i2<i1) i2=i1; if(i2>=h2->NBinX()) i2=h2->NBinX()-1;
   if(j2<j1) j2=j1; if(j2>=h2->NBinY()) j2=h2->NBinY()-1;
-  for(int i=i1;i<=i2;i++) for(int j=j1;j<=j2;j++) {
+  for(int_4 i=i1;i<=i2;i++) for(int_4 j=j1;j<=j2;j++) {
     bool change = true;
     if(testcont==1) {if((*h2)(i,j)<v1 || (*h2)(i,j)>v2) change = false;}
@@ -1201 +1201 @@
   Histo* h  = dynamic_cast<Histo*>(mobj);
   if(!(h->HasErrors())) h->Errors();
-  for(int i=0;i<h->NBins();i++) {
-    double x = (double) (*h)(i);
-    double e = f(x);
+  for(int_4 i=0;i<h->NBins();i++) {
+    r_8 x = (*h)(i);
+    r_8 e = f(x);
     h->SetErr2(i,e*e); 
   }
@@ -1210 +1210 @@
   Histo2D* h2 = dynamic_cast<Histo2D*>(mobj);
   if(!(h2->HasErrors())) h2->Errors();
-  for(int i=0;i<h2->NBinX();i++) for(int j=0;j<h2->NBinY();j++) {
-    double x = (double) (*h2)(i,j);
-    double e = f(x);
+  for(int_4 i=0;i<h2->NBinX();i++) for(int_4 j=0;j<h2->NBinY();j++) {
+    r_8 x = (*h2)(i,j);
+    r_8 e = f(x);
     h2->Error2(i,j) = e*e; 
   }

trunk/SophyaPI/PIext/piafitting.cc

@@ -598 +598 @@
     {x=(double) i; y=(double) j; f=(*mM)(j,i); e=1.;}
   else if(mH2)
-    {float xf,yf; mH2->BinCenter(i,j,xf,yf); x=(double)xf; y=(double)yf;
+    {r_8 xf,yf; mH2->BinCenter(i,j,xf,yf); x=xf; y=yf;
      f=(*mH2)(i,j); e=(mH2->HasErrors())?mH2->Error(i,j):1.;}
   else if(mIm)

trunk/SophyaPI/PIext/piafitting.h

@@ -56 +56 @@
   int nstep;
   int lp,lpg;
-  int i1,i2,j1,j2;
+  int_4 i1,i2,j1,j2;
   bool fromlastfit,autoinifit;
 } DFOPTIONS ;
@@ -91 +91 @@
 // Structure de data pour le fit, parametres et options
 GeneralFitData* mGData;
-int mNPar,mNVar,mNBinX,mNBinY,mNData;
+int_4 mNPar,mNVar,mNBinX,mNBinY,mNData;
 Vector mPar; Vector mStep; Vector mMin; Vector mMax; Vector mFix;
 Vector mParSave; Vector mStepSave; Vector mMinSave; Vector mMaxSave; Vector mFixSave;
@@ -110 +110 @@
 DlUserFitFunc mFitFunc;
 DlUserFitFuncDer mFitFuncDer;
-int mUFNVar, mUFNPar; 
+int_4 mUFNVar, mUFNPar; 
 };
 

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -247 +247 @@
 for (int j=0; j<mHisto->NBinY(); j++) {
 
-  float left0,bottom0;
+  r_8 left0,bottom0;
   mHisto->BinLowEdge(i,j,left0,bottom0);
 

trunk/SophyaPI/PIext/servnobjm.cc

@@ -579 +579 @@
     return;
   }
-  double xmin, xmax;
+  r_8 xmin, xmax;
   nt->GetMinMax(0, xmin, xmax);
   hprof = new HProf(xmin, xmax, 100);