Changeset 769 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Mar 2, 2000, 6:24:08 PM (26 years ago)

Author:

ercodmgr

Message:

Adaptation Sophya, suppression cvector, classe ObjectFitter - Reza 2/3/2000

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• piafitting.cc (modified) (2 diffs)
• piinit.cc (modified) (1 diff)
• piinit.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -19 +19 @@
 #include "ntuple.h"
 #include "generaldata.h"
+
+#ifdef SANS_EVOLPLANCK
 #include "cvector.h"
+#else
+#include "tvector.h"
+#endif
 
 

trunk/SophyaPI/PIext/piafitting.cc

@@ -30 +30 @@
 #include "tmatrix.h"
 #include "tvector.h"
+#include "objfitter.h"
 #endif
 
@@ -927 +928 @@
 //####################
   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);}
+    if(mOpt.okres) {
+      Vector* ob = new Vector(ObjectFitter::FitResidus(*mV, *mFit),true);  
+      if(ob) omg.AddObj(ob,nomres);
+    }
+    if(mOpt.okfun) {
+      Vector* ob = new Vector(ObjectFitter::FitFunction(*mV, *mFit),true); 
+      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);}
+    if(mOpt.okres) {
+      Matrix* ob = new Matrix(ObjectFitter::FitResidus(*mM, *mFit), true);  
+      if(ob) omg.AddObj(ob,nomres);
+    }
+    if(mOpt.okfun) {
+      Matrix* ob = new Matrix(ObjectFitter::FitFunction(*mM, *mFit), true); 
+      if(ob) omg.AddObj(ob,nomfun);
+    }
   } else if(mH2) {
     if(mOpt.okres)

trunk/SophyaPI/PIext/piinit.cc

@@ -28 +28 @@
 
 PIAppInitiator::PIAppInitiator(PIStdImgApp * app)
+#ifdef SANS_EVOLPLANCK
  : PeidaOutilsInitiator()
+#else
+ : SambaInitiator()
+#endif
 {
   FgInit++;

trunk/SophyaPI/PIext/piinit.h

@@ -2 +2 @@
 #define PIINIT_H_SEEN
 
+#ifdef SANS_EVOLPLANCK
 #include "outilsinit.h"
+#else
+#include "sambainit.h"
+#endif
+
 #include "pistdimgapp.h"
 
-// Classe d initialisation pour le module PI de PEIDA
+// Classe d initialisation pour le module PIext de PEIDA
 
-class PIAppInitiator : public PeidaOutilsInitiator {
+class PIAppInitiator : public SambaInitiator {
 private:
   static int FgInit;