Changeset 594 in Sophya

Timestamp:

Nov 17, 1999, 7:49:32 PM (26 years ago)

Author:

ercodmgr

Message:

finalisation interfacage TMatrix, PixelMap - Reza 17/11/99

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (5 diffs)
• nomskymapadapter.cc (modified) (6 diffs)
• nomskymapadapter.h (modified) (2 diffs)
• pitvmaad.cc (added)
• pitvmaad.h (modified) (5 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -955 +955 @@
 obja = GetObjAdapter(nom);
 if (obja == NULL)  return;
-
-string ctyp = typeid(*obja->GetDataObj()).name();
+AnyDataObj* ob = obja->GetDataObj();
+if (ob == NULL) {
+  cerr << "NamedObjMgr::PrintObj() / Error - NULL object ! in " << nom << endl;
+  return;
+  }
+string ctyp = typeid(*ob).name();
 cout << "NamedObjMgr::PrintObj(" << nom << ") Type: " << ctyp << endl;
 obja->Print(cout);
@@ -969 +973 @@
 obja = GetObjAdapter(nom);
 if (obja == NULL) {
-  cout << "NamedObjMgr::DisplayObj() Error , Pas d'objet de nom " << nom << endl; 
+  cout << "NamedObjMgr::DisplayObj() Error , No object with name " << nom << endl; 
   return;
 }
+if (obja->GetDataObj() == NULL) {
+  cerr << "NamedObjMgr::DisplayObj() / Error - NULL object ! in " << nom << endl;
+  return;
+  }
 if (!myImgApp)  return;
  
@@ -981 +989 @@
 if (!dr && !arr) { 
   string ctyp = typeid(*(obja->GetDataObj())).name();
-  cout << "NamedObjMgr::DisplayObj() Error , Pas de display pour " << ctyp << endl; 
+  cout << "NamedObjMgr::DisplayObj() Error , No display for " << ctyp << endl; 
   return;
   }
@@ -1017 +1025 @@
   return;
 }
+if (obja->GetDataObj() == NULL) {
+  cerr << "NamedObjMgr::DisplayImage() / Error - NULL object ! in " << nom << endl;
+  return;
+  }
 if (!myImgApp)  return;
  
@@ -1052 +1064 @@
   return;
 }
+if (obja->GetDataObj() == NULL) {
+  cerr << "NamedObjMgr::DisplaySurf3D() / Error - NULL object ! in " << nom << endl;
+  return;
+  }
 if (!myImgApp)  return;
  

trunk/SophyaPI/PIext/nomskymapadapter.cc

@@ -1 +1 @@
 #include "machdefs.h"
 #include <stdlib.h>
+#include <math.h>
 #include <typeinfo>
 #include <iostream.h>
@@ -10 +11 @@
 #include "spheregorski.h"
 #include "localmap.h"
-
+#include "pitvmaad.h"
+#include "complexios.h"
+
+//  Classe array adapter pour localMap
+template <class T> 
+class LocalMapArrAdapter : public P2DArrayAdapter {
+public:
+                LocalMapArrAdapter(LocalMap<T>* lm, bool d=false) :
+                    P2DArrayAdapter(lm->XSize(), lm->YSize())
+                    { ad = d; map = lm; }
+
+  virtual       ~LocalMapArrAdapter() { if (ad) delete map; }
+  virtual double  Value(int ix, int iy) { return((*map)(ix, iy)); }
+
+protected :
+  bool ad;
+  LocalMap<T>* map;
+};
+
+/* --Methode-- */
+double LocalMapArrAdapter< complex<float> >::Value(int ix, int iy) 
+{
+double re,im;
+re = (*map)(iy, ix).real();
+im = (*map)(iy, ix).imag();
+return(sqrt(re*re+im*im));
+}
+/* --Methode-- */
+double LocalMapArrAdapter< complex<double> >::Value(int ix, int iy) 
+{
+double re,im;
+re = (*map)(iy, ix).real();
+im = (*map)(iy, ix).imag();
+return(sqrt(re*re+im*im));
+}
 
 //----------------------------------------------------------------
@@ -20 +55 @@
 template <class T> 
 NOMAdapter_PixelMap<T>::NOMAdapter_PixelMap(PixelMap<T> * o)
-  : NObjMgrAdapter((AnyDataObj *)o)
+  : NObjMgrAdapter(o)
 {
 mMap = o;
@@ -84 +119 @@
 {
 string s = typeid(*mMap).name();
+T moy, sig;
+MeanSig(moy, sig);
 cout << "SkyMap Type: " << s << " NbPixels= " << mMap->NbPixels() << endl;
+cout << "  Mean= " << moy << "  Sig2= " << sig << endl;
 }
 
@@ -92 +130 @@
 P2DArrayAdapter* NOMAdapter_PixelMap<T>::Get2DArray(string &)
 {
-return(NULL);
+LocalMap<T>* lm = dynamic_cast< LocalMap<T> * >(mMap); 
+if (lm != NULL) return(new LocalMapArrAdapter<T>(lm, false));
+int nr = 250;
+int nc = 500;
+SphericalMap<T>* sm = dynamic_cast< SphericalMap<T> *>(mMap);
+if (sm != NULL) { nr = sqrt(0.75*mMap->NbPixels());  nc = 2*nr; }
+TMatrix<T> * mtx = new TMatrix<T>(nr, nc);
+Project_Mol(*mtx);
+return (new POTMatrixAdapter<T>(mtx, true) );
 }
 
@@ -103 +149 @@
 }
 
-
+/* --Methode-- */
+template <class T> 
+void NOMAdapter_PixelMap<T>::MeanSig(T& gmoy, T& gsig)
+{
+  gmoy=0.;
+  gsig = 0.;
+  T valok;
+  for(int k=0; k<mMap->NbPixels(); k++) {
+    valok = (*mMap)(k);
+    gmoy += valok;  gsig += valok*valok;
+  }
+  gmoy /= (T)mMap->NbPixels();
+  gsig = gsig/(T)mMap->NbPixels() - gmoy*gmoy;
+
+}
+
+/* --Methode-- */
+template <class T> 
+void NOMAdapter_PixelMap<T>::Project_Mol(TMatrix<T> & mtx, T defval)
+{
+  r_8 xa, yd, teta,phi, facteur;
+  int_4 l,c,k;
+  int_4 nl = mtx.NRows();
+  int_4 nc = mtx.NCols();
+  mtx.Reset(defval);   // On met tout a defval
+//  cout << " NRows= " << nl << "  NCols= " << nc  << endl;
+  for(l=0; l<nl; l++) {
+    yd = (r_8)(l+0.5)/(r_8)nl-0.5;
+    facteur=2.*M_PI/sin(acos((double)yd*2));
+    teta = (yd+0.5)*Pi;
+    //    teta = (0.5-yd)*M_PI;
+    for(c=0; c<nc; c++)  {
+      xa = (r_8)(c+0.5)/(r_8)nc-0.5;
+      phi = xa*facteur+M_PI;
+      if ( (phi <= 2*M_PI) && (phi >= 0.) ) {
+        k = mMap->PixIndexSph(teta, phi);
+        mtx(l,c) = (*mMap)(k);
+      }
+    }
+  }
+}
 
 // -------------------------------------------------------------

trunk/SophyaPI/PIext/nomskymapadapter.h

@@ -9 +9 @@
 
 #include "nomgadapter.h"
+#include "tmatrix.h"
 #include "pixelmap.h"
 
@@ -34 +35 @@
   virtual NTupleInterface*      GetNTupleInterface(bool& adel);
 
+  virtual void                  MeanSig(T& gmoy, T& gsig);
+  virtual void                  Project_Mol(TMatrix<T> & mtx, T defval=0.);
+
 protected:
   PixelMap<T>* mMap;

trunk/SophyaPI/PIext/pitvmaad.h

@@ -8 +8 @@
 
 #include "machdefs.h"
-#include <math.h>
 #include "parradapter.h"
 
@@ -19 +18 @@
 class POTVectorAdapter : public P1DArrayAdapter {
 public :
-                  POTVectorAdapter(TVector<T>* v, bool ad=false) 
-                        : P1DArrayAdapter(v->NElts())
-                                { aDel = ad; mVec = v; }
-  virtual         ~POTVectorAdapter()
-                                { if (aDel) delete mVec; }
-  virtual double  Value(int i)
-                                { return((*mVec)(i)); }
+                  POTVectorAdapter(TVector<T>* v, bool ad=false); 
+  virtual         ~POTVectorAdapter();
+  virtual double  Value(int i);
 
 protected:
@@ -34 +29 @@
 typedef POTVectorAdapter<r_8> POVectorAdapter;
 
-double POTVectorAdapter< complex<float> >::Value(int i)
-{
-double re,im;
-re = (*mVec)(i).real();
-im = (*mVec)(i).imag();
-return(sqrt(re*re+im*im));
-}
-
-double POTVectorAdapter< complex<double> >::Value(int i)
-{
-double re,im;
-re = (*mVec)(i).real();
-im = (*mVec)(i).imag();
-return(sqrt(re*re+im*im));
-}
 
 // Adaptateur de matrice SOPHYA a P2DArrayAdapter
@@ -55 +35 @@
 class POTMatrixAdapter :  public P2DArrayAdapter {
 public :
-                  POTMatrixAdapter(TMatrix<T>* mtx, bool ad=false)
-                        : P2DArrayAdapter(mtx->NCols(), mtx->NRows())
-                        { aDel = ad; mMtx = mtx; }
-  virtual         ~POTMatrixAdapter()
-                        { if (aDel)  delete mMtx; }
-  virtual double  Value(int ix, int iy)
-                        { return((double)(*mMtx)(iy, ix)); }
+                  POTMatrixAdapter(TMatrix<T>* mtx, bool ad=false);
+  virtual         ~POTMatrixAdapter();
+  virtual double  Value(int ix, int iy);
 
 protected:
@@ -70 +46 @@
 typedef POTMatrixAdapter<r_8> POMatrixAdapter;
 
-double POTMatrixAdapter< complex<float> >::Value(int ix, int iy)
-{
-double re,im;
-re = (*mMtx)(iy, ix).real();
-im = (*mMtx)(iy, ix).imag();
-return(sqrt(re*re+im*im));
-}
-
-double POTMatrixAdapter< complex<double> >::Value(int ix, int iy)
-{
-double re,im;
-re = (*mMtx)(iy, ix).real();
-im = (*mMtx)(iy, ix).imag();
-return(sqrt(re*re+im*im));
-}
 #endif