Changeset 604 in Sophya for trunk

Timestamp:

Nov 20, 1999, 9:39:49 PM (26 years ago)

Author:

ansari

Message:

Bugs InitNul et autres - Reza 20/11/99

Location:

trunk/SophyaLib/Samba

Files:

• localmap.cc (modified) (7 diffs)
• localmap.h (modified) (1 diff)
• spheregorski.cc (modified) (11 diffs)
• spheregorski.h (modified) (1 diff)
• spherethetaphi.cc (modified) (8 diffs)
• spherethetaphi.h (modified) (1 diff)

trunk/SophyaLib/Samba/localmap.cc

@@ -90 +90 @@
 {
   InitNul();
+  pixels_.Reset();
 }
 
@@ -417 +418 @@
   cos_angle_= 1.0;
   sin_angle_= 0.0;
-  pixels_.Reset();
+//  pixels_.Reset(); Pas de reset par InitNul (en cas de share) - Reza 20/11/99 $CHECK$
 }
 
@@ -589 +590 @@
 {
   dobj= new LocalMap<T>;
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
   Read(filename);
@@ -600 +602 @@
 {
   dobj= new LocalMap<T>(obj, true);
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
 }
@@ -637 +640 @@
     {
       dobj= new LocalMap<T>;
+      dobj->DataBlock().SetTemp(true);
+      ownobj= true;
     }
 
@@ -682 +687 @@
     }
 
-  T* pixels= new T[nPix];
-  PIOSReadArray(is, pixels, nPix);
-  dobj->setDataBlock(pixels, nPix);
-  delete [] pixels;
+// On lit le DataBlock;
+  is >> dobj->DataBlock();
 }
 
@@ -745 +748 @@
     }
 
-  PIOSWriteArray(os,(dobj->getDataBlock())->Data(), nPix);
-}
-
+// On ecrit le dataBlock 
+  os << dobj->DataBlock();
+}
+

trunk/SophyaLib/Samba/localmap.h

@@ -156 +156 @@
 inline void setDataBlock(T* data, int n) {pixels_.FillFrom(n,data);}
 
+/*  Acces to the DataBlock  */
+inline       NDataBlock<T>& DataBlock()       {return pixels_;}
+inline const NDataBlock<T>& DataBlock() const {return pixels_;}
+
 /* impression */ 
 void print(ostream& os) const;

trunk/SophyaLib/Samba/spheregorski.cc

@@ +1 @@
+#include "machdefs.h"
+#include <math.h>
+#include <complex>
+
+#include "pexceptions.h"
 #include "spheregorski.h"
 #include "strutil.h"
-#include <math.h>
-#include <complex>
-#include "piocmplx.h"
 
 extern "C" 
@@ -179 +181 @@
 {
   InitNul();
+  pixels_.Reset();
 }
 
@@ -196 +199 @@
     {
       cout << "SphereGorski : m hors bornes [0,8192], m= " << m << endl;
-      exit(1);
+      throw RangeCheckError("SphereGorski<T>::SphereGorski() - Out of bound nside (< 8192)!");
     }
   // verifier que m est une puissance de deux 
@@ -204 +207 @@
     {  
       cout<<"SphereGorski: m doit etre une puissance de deux, m= "<<m<<endl;
-      exit(1);
+      throw ParmError("SphereGorski<T>::SphereGorski() - nside != 2^n !");
     }
   InitNul();
@@ -233 +236 @@
 //--
 {
-  InitNul();
+//  InitNul();  - Non , le destructeur ne doit pas mettre les pixels a zero !
+//              Reza 20/11/99
 }
 
@@ -303 +307 @@
   nPix_ = 0;
   omeg_ = 0.;
-  pixels_.Reset();
-
+//  pixels_.Reset();  -  Il ne faut pas mettre les pixels a zero si share !
 }
 
@@ -1114 +1117 @@
 {
   dobj= new SphereGorski<T>;
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
   Read(filename);
@@ -1122 +1126 @@
 {
   dobj= new SphereGorski<T>(obj, true);
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
 }
@@ -1151 +1156 @@
     {
       dobj= new SphereGorski<T>;
+      dobj->DataBlock().SetTemp(true);
+      ownobj= true;      
     }
 
@@ -1179 +1186 @@
   dobj->setPixSolAngle(Omega);
 
-  T* pixels= new T[nPix];
-  PIOSReadArray(is, pixels, nPix);
-  dobj->setDataBlock(pixels, nPix);
-  delete [] pixels;
-
+// On lit le DataBlock;
+  is >> dobj->DataBlock();
 }
 
@@ -1218 +1222 @@
   os.PutI4(nPix);
   os.PutR8(dobj->PixSolAngle(0));
-
-  PIOSWriteArray(os,(dobj->getDataBlock())->Data(), nPix);
-
-
+// On ecrit le dataBlock 
+  os << dobj->DataBlock();
 }
 

trunk/SophyaLib/Samba/spheregorski.h

@@ -168 +168 @@
 inline void setDataBlock(T* data,int m) { pixels_.FillFrom(m,data); }
 
+/*  Acces to the DataBlock  */
+inline       NDataBlock<T>& DataBlock()       {return pixels_;}
+inline const NDataBlock<T>& DataBlock() const {return pixels_;}
+
 
 

trunk/SophyaLib/Samba/spherethetaphi.cc

@@ -42 +42 @@
 {
   InitNul();
+  pixels_.Reset();
 }
 
@@ -79 +80 @@
   TNphi_[NTheta_]= s.TNphi_[NTheta_];
   Omega_ = s.Omega_;
-  pixels_= s.pixels_;
 }
 
@@ -107 +107 @@
   NPhi_  = NULL;
   TNphi_ = NULL;
-  pixels_.Reset();
+//  pixels_.Reset();  Pas de reset par InitNul (en cas de share) - Reza 20/11/99 $CHECK$
 }
 
@@ -686 +686 @@
 {
   dobj= new SphereThetaPhi<T>;
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
   Read(filename);
@@ -694 +695 @@
 {
   dobj= new SphereThetaPhi<T>(obj, true);
+  dobj->DataBlock().SetTemp(true);
   ownobj= true;
 }
@@ -723 +725 @@
     {
       dobj= new SphereThetaPhi<T>;
+      dobj->DataBlock().SetTemp(true);
+      ownobj= true;      
     }
 
@@ -766 +770 @@
   delete [] mTheta;
 
-  T* mPixels= new T[mNPix];
-  PIOSReadArray(is, mPixels, mNPix);
-  dobj->setDataBlock(mPixels, mNPix);
-  delete [] mPixels;
+// On lit le DataBlock;
+  is >> dobj->DataBlock();
 }
 
@@ -807 +809 @@
   os.PutI4s(dobj->getmTNphi(), mNTheta+1);
   os.PutR8s(dobj->getmTheta(), mNTheta+1);
-  //os.Put((dobj->getDataBlock())->Data(), mNPix);
-  PIOSWriteArray(os,(dobj->getDataBlock())->Data(), mNPix);
+// On ecrit le datablock
+  os << dobj->DataBlock();
 }
 

trunk/SophyaLib/Samba/spherethetaphi.h

@@ -149 +149 @@
 void setDataBlock(T* data, int m);
 
+/*  Acces to the DataBlock  */
+inline       NDataBlock<T>& DataBlock()       {return pixels_;}
+inline const NDataBlock<T>& DataBlock() const {return pixels_;}
+
 /* impression */ 
 void print(ostream& os) const;