Changeset 1067 in Sophya for trunk/SophyaPI/PIext/piafitting.cc

Timestamp:

Jul 12, 2000, 7:24:33 PM (25 years ago)

Author:

ercodmgr

Message:

piafitting.cc: GeneralData::GetMinMax -> GeneralData::GetMnMx
autres fichiers: intro de gdfrvec (FillGFDfrVec)

cmv 12/07/00

File:

• trunk/SophyaPI/PIext/piafitting.cc (modified) (5 diffs)

trunk/SophyaPI/PIext/piafitting.cc

@@ -548 +548 @@
   else if(mH)  mOpt.xc = (mH->XMin()+mH->XMax())/2.;
   else if(mH2) mOpt.xc = (mH2->XMin()+mH2->XMax())/2.;
-  else if(mG)  {double mini,maxi; mG->GetMinMax(2,mini,maxi); mOpt.xc=(mini+maxi)/2.;}
+  else if(mG)  {double mini,maxi; mG->GetMnMx(2,mini,maxi); mOpt.xc=(mini+maxi)/2.;}
   else if(mIm) {mOpt.xc = mIm->XOrg() * mIm->XPxSize()*(mOpt.i2-mOpt.i1+1)/2.;}
 }
@@ -554 +554 @@
   if(mM)  mOpt.yc = (mOpt.j2-mOpt.j1+1)/2.;
   if(mH2) mOpt.yc = (mH2->YMin()+mH2->YMax())/2.;
-  if(mG)  {double mini,maxi; mG->GetMinMax(12,mini,maxi); mOpt.yc=(mini+maxi)/2.;}
+  if(mG)  {double mini,maxi; mG->GetMnMx(12,mini,maxi); mOpt.yc=(mini+maxi)/2.;}
   if(mIm) {mOpt.yc = mIm->YOrg() * mIm->YPxSize()*(mOpt.j2-mOpt.j1+1)/2.;}
 }
@@ -622 +622 @@
 }
 
-if(mOpt.lpg>1) {
+if(mOpt.lp>2) {
   mGData->PrintStatus();
   mGData->PrintData(0);
   mGData->PrintData(mGData->NData()-1);
+  double mini,maxi;
+  mGData->GetMnMx(2,mini,maxi);
+    cout<<"Limites ...x0 = ["<<mini<<","<<maxi<<"]"<<endl;
+  if(mNVar==2)
+    {mGData->GetMnMx(12,mini,maxi);
+     cout<<"Limites ...x1 = ["<<mini<<","<<maxi<<"]"<<endl;}
+  mGData->GetMnMx(0,mini,maxi);
+    cout<<"Limites ...y  = ["<<mini<<","<<maxi<<"]"<<endl;
+  mGData->GetMnMx(1,mini,maxi);
+    cout<<"Limites ...ey = ["<<mini<<","<<maxi<<"]"<<endl;
 }
 
@@ -1518 +1528 @@
 void PIAFitterWind::Process(PIMessage msg, PIMsgHandler* sender, void* data)
 {
-int lp = (mFitter->mOpt.lp>2)?1:0;;
+int lp = (mFitter->mOpt.lp>2)?1:0;
 int npar = mFitter->mNPar;
 
@@ -1596 +1606 @@
   if(ReFillGData) mFitter->FillGData();
   ReFillGData = false;
-  if(mFitter->mFit) mFitter->mFit->PrintStatus();
 }
 else if(msg ==111) {