Changeset 493 in Sophya for trunk/SophyaPI

Timestamp:

Oct 21, 1999, 6:08:44 PM (26 years ago)

Author:

ercodmgr

Message:

Preparation pour portage DPC , cmv 21/10/99

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (1 diff)
• piafitting.cc (modified) (3 diffs)
• piafitting.h (modified) (2 diffs)
• pimgadapter.h (modified) (2 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -778 +778 @@
 {
 bool ok = true;
+#ifdef SANS_EVOLPLANCK 
 RzImage* obj;
+#else
+//CMV_A_FAIRE RzImage* obj;
+#endif
 
 TRY{

trunk/SophyaPI/PIext/piafitting.cc

@@ -498 +498 @@
      return;}
   }
+#ifdef SANS_EVOLPLANCK
 else if (dynamic_cast<RzImage*>(mObj)) {
   mNVar = 2;
   mIm = (RzImage*) mObj; mNBinX = mIm->XSize(); mNBinY = mIm->YSize();
   }
+#else
+//CMV_A_FAIRE else if (dynamic_cast<RzImage*>(mObj)) {
+//CMV_A_FAIRE   mNVar = 2;
+//CMV_A_FAIRE   mIm = (RzImage*) mObj; mNBinX = mIm->XSize(); mNBinY = mIm->YSize();
+//CMV_A_FAIRE   }
+#endif
 else {
   cout<<"PIAFitter::DecodeObject Error , Objet n'est pas un "
@@ -878 +885 @@
   string nomres = mNObj + "_res";
   string nomfun = mNObj + "_fun";
+//####################
+#ifdef SANS_EVOLPLANCK
+//####################
   if(mV) {
     if(mOpt.okres) {Vector* ob = mV->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
@@ -907 +917 @@
       {GeneralFitData* ob = mG->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
   }
+//####################
+#else
+//####################
+  if(mV) {
+    if(mOpt.okres) {Vector* ob = new Vector(mV->FitResidus(*mFit));  if(ob) omg.AddObj(ob,nomres);}
+    if(mOpt.okfun) {Vector* ob = new Vector(mV->FitFunction(*mFit)); if(ob) omg.AddObj(ob,nomfun);}
+  } else if(mH) {
+    if(mOpt.okres) {Histo* ob =  new Histo(mH->FitResidus(*mFit));  if(ob) omg.AddObj(ob,nomres);}
+    if(mOpt.okfun) {Histo* ob =  new Histo(mH->FitFunction(*mFit)); if(ob) omg.AddObj(ob,nomfun);}
+  } else if(mM) {
+    if(mOpt.okres) {Matrix* ob = new Matrix(mM->FitResidus(*mFit));  if(ob) omg.AddObj(ob,nomres);}
+    if(mOpt.okfun) {Matrix* ob = new Matrix(mM->FitFunction(*mFit)); if(ob) omg.AddObj(ob,nomfun);}
+  } else if(mH2) {
+    if(mOpt.okres)
+      {Histo2D* ob = new Histo2D(mH2->FitResidus(*mFit));  if(ob) omg.AddObj(ob,nomres);}
+    if(mOpt.okfun)
+      {Histo2D* ob = new Histo2D(mH2->FitFunction(*mFit)); if(ob) omg.AddObj(ob,nomfun);}
+//CMV_A_FAIRE  } else if(mIm) {
+//CMV_A_FAIRE    if(mOpt.okres) {
+//CMV_A_FAIRE      RzImage* ob = mIm->FitResidus(*mFit);  
+//CMV_A_FAIRE      if(ob) {ImageR4* rob = new ImageR4(*ob); omg.AddObj(rob,nomres); delete ob;}
+//CMV _A_FAIRE    }
+//CMV_A_FAIRE    if(mOpt.okfun) {
+//CMV_A_FAIRE      RzImage* ob = mIm->FitFunction(*mFit);
+//CMV_A_FAIRE      if(ob) {ImageR4* rob = new ImageR4(*ob); omg.AddObj(rob,nomfun); delete ob;}
+//CMV_A_FAIRE    }
+  } else if(mG) {
+    if(mOpt.okres)
+      {GeneralFitData* ob = new GeneralFitData(mG->FitResidus(*mFit));  if(ob) omg.AddObj(ob,nomres);}
+    if(mOpt.okfun)
+      {GeneralFitData* ob = new GeneralFitData(mG->FitFunction(*mFit)); if(ob) omg.AddObj(ob,nomfun);}
+  }
+//####################
+#endif
+//####################
 }
 return;

trunk/SophyaPI/PIext/piafitting.h

@@ -22 +22 @@
 class GeneralFunction; class GeneralFunc; class GeneralFit;
 class GeneralFitData;
-class Histo; class Matrix; class Histo2D; class RzImage;
+class Histo; class Matrix; class Histo2D;
+#ifdef SANS_EVOLPLANCK
+class RzImage;
+#else
+//CMV_A_FAIRE class RzImage;
+#endif
 
 class PIAFitter : public CmdExecutor {
@@ -88 +93 @@
 // Possibles objets a fitter
 Vector* mV; Histo* mH; // Do not delete
-Matrix* mM; Histo2D* mH2; RzImage* mIm; // Do not delete
+Matrix* mM; Histo2D* mH2; // Do not delete
+#ifdef SANS_EVOLPLANCK
+RzImage* mIm; // Do not delete
+#else
+//CMV_A_FAIRE RzImage* mIm; // Do not delete
+#endif
 GeneralFitData* mG; // Do not delete
 // Gestion des fonctions de fit predefinies

trunk/SophyaPI/PIext/pimgadapter.h

@@ -5 +5 @@
 #include "parradapter.h"
 
+#ifdef SANS_EVOLPLANCK 
 class RzImageAdapter : public P2DArrayAdapter {
 public:
@@ -19 +20 @@
   RzImage* mImg;
 };
+#endif
 
 template <class T>