Changeset 701 in Sophya for trunk/SophyaLib/Samba/spherethetaphi.cc

Timestamp:

Jan 4, 2000, 3:27:29 PM (26 years ago)

Author:

ansari

Message:

mise a jour de persistances par objets delegues

File:

• trunk/SophyaLib/Samba/spherethetaphi.cc (modified) (10 diffs)

trunk/SophyaLib/Samba/spherethetaphi.cc

@@ -322 +322 @@
 //--
 {
-  int nbslices;
-  nbslices= 2*NTheta_;
-  return(nbslices);
+  return( 2*NTheta_);
 }
 
@@ -566 +564 @@
 {
 
-  if(index < 0 || index > NbThetaSlices()) 
+  if(index < 0 || index >= NbThetaSlices()) 
     {
       // THROW(out_of_range("SphereThetaPhi::PIxVal Pixel index out of range")); 
-      cout << " SphereThetaPhi::GetThetaSlice : exceptions  a mettre en place" <<endl;
+      cout << " SphereThetaPhi::GetThetaSlice : Pixel index out of range" <<endl;
       THROW(rangeCheckErr);
     }
 
   int iring= Index(index,0);
-  int bid  = this->NPhi(index);
-  int lring  = bid;
+  int lring  = NPhi(index);
 
   phi.ReSize(lring);
@@ -617 +614 @@
 }
 
-template <class T>
-void SphereThetaPhi<T>::setDataBlock(T* data, int_4 m)
-  // remplit  le vecteur des contenus des pixels 
-{
-  pixels_.FillFrom(m,data);
-} 
 
 template <class T>
@@ -684 +675 @@
 {
   dobj= new SphereThetaPhi<T>;
-  dobj->DataBlock().SetTemp(true);
+  //  dobj->DataBlock().SetTemp(true);
+  dobj->pixels_.SetTemp(true);
   ownobj= true;
   Read(filename);
@@ -693 +685 @@
 {
   dobj= new SphereThetaPhi<T>(obj, true);
-  dobj->DataBlock().SetTemp(true);
+  //  dobj->DataBlock().SetTemp(true);
+  dobj->pixels_.SetTemp(true);
   ownobj= true;
 }
@@ -723 +716 @@
     {
       dobj= new SphereThetaPhi<T>;
-      dobj->DataBlock().SetTemp(true);
+      //      dobj->DataBlock().SetTemp(true);
+      dobj->pixels_.SetTemp(true);
       ownobj= true;      
     }
 
 // Let's Read the SphereCoordSys object  -- ATTENTIOn - $CHECK$
-  SphereCoordSys* cs = dynamic_cast<SphereCoordSys*>(is.ReadObject());
-  dobj->SetCoordSys(cs);
+  FIO_SphereCoordSys fio_scs( dobj->GetCoordSys());
+  fio_scs.Read(is);
 
   // Pour savoir s'il y avait un DVList Info associe
@@ -743 +737 @@
   int_4 mNTheta;
   is.GetI4(mNTheta);  
-  dobj->setSizeIndex(mNTheta);
-
   int_4 mNPix;
   is.GetI4(mNPix);
-  dobj->setNbPixels(mNPix);
-
   double mOmeg;
   is.GetR8(mOmeg);
-  dobj->setPixSolAngle(mOmeg);
+  dobj->setParameters(mNPix, mOmeg, mNTheta); 
 
   int_4* mNphi= new int_4[mNTheta];
@@ -769 +759 @@
 
 // On lit le DataBlock;
-  is >> dobj->DataBlock();
+  //FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+FIO_NDataBlock<T> fio_nd(&dobj->pixels_);
+fio_nd.Read(is);
+//  is >> dobj->DataBlock();
 }
 
@@ -783 +776 @@
 
 // Let's write the SphereCoordSys object
-  dobj->GetCoordSys()->Write(os);
+  FIO_SphereCoordSys fio_scs( dobj->GetCoordSys());
+  fio_scs.Write(os);
   
   char strg[256];
@@ -803 +797 @@
   os.PutI4(mNTheta);  
   os.PutI4(mNPix);
-  os.PutR8(dobj->PixSolAngle(0));
+  os.PutR8(dobj->PixSolAngle());
   os.PutI4s(dobj->getmNPhi() , mNTheta);
   os.PutI4s(dobj->getmTNphi(), mNTheta+1);
   os.PutR8s(dobj->getmTheta(), mNTheta+1);
 // On ecrit le datablock
-  os << dobj->DataBlock();
+  //FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+FIO_NDataBlock<T> fio_nd(&dobj->pixels_);
+fio_nd.Write(os);
+//  os << dobj->DataBlock();
 }