Changeset 545 in Sophya for trunk

Timestamp:

Nov 3, 1999, 7:47:56 PM (26 years ago)

Author:

ercodmgr

Message:

modifs TVector/TMatrix pour compil Planck - Reza 3/11/99

Location:

trunk/SophyaPI/PIext

Files:

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

trunk/SophyaPI/PIext/pawexecut.cc

@@ -23 +23 @@
 #include "tmatrix.h"
 #include "tvector.h"
-
 #endif
 
@@ -142 +141 @@
 string ctyp = typeid(*mobj).name();
 
+#ifdef SANS_EVOLPLANCK
 if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Zero();}
 else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Zero();}
+#else
+if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Reset(0.);}
+else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Reset(0.);}
+#endif
 else if(typeid(*mobj)==typeid(Histo))   {Histo*   ob=(Histo*)  mobj; ob->Zero();}
 else if(typeid(*mobj)==typeid(HProf))   {HProf*   ob=(HProf*)  mobj; ob->Zero();}

trunk/SophyaPI/PIext/piafitting.h

@@ -16 +16 @@
 #include "dlftypes.h"
 #include "piacmd.h"
-#include "cvector.h"
 
 class PIStdImgApp;
 class PIAFitterWind;
-class Matrix; 
 class RzImage; //CMV_A_FAIRE class RzImage;
 
 #ifdef SANS_EVOLPLANCK
+#include "cvector.h"
 class GeneralFunction; class GeneralFunc; class GeneralFit;
 class GeneralFitData;
 class Histo;  class Histo2D;
 #else
+#include "tvector.h"
 namespace PlanckDPC { 
 class GeneralFunction; class GeneralFunc; class GeneralFit;