Changeset 2933 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Apr 3, 2006, 2:20:29 PM (19 years ago)

Author:

ansari

Message:

Suppression de toute reference a FITS (en particulier NObjMgrAdapter::ReadFits/SaveFits supprime) dans le module PIext - Makefile et smakefile refait , Reza 3 Avril 2006

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (3 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -24 +24 @@
 #include "fitsimage.h"  
 #else
-#include "fitsautoreader.h"
 #include "tvector.h"
 #include "pitvmaad.h"
@@ -1113 +1112 @@
 }
 
-/* --Methode-- */
-void NamedObjMgr::ReadFits(string const & flnm, string & nobj)
-{
-ZSync zs(*myMutex); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK 
-bool ok = false;
-RzImage* obj=NULL;
-TRY{
-  obj = RzReadFits((char*)flnm.c_str());
-  if (obj == NULL)   ok = false;
-  else ok = true;
-}  CATCH(merr) { 
-  printf("NamedObjMgr::ReadFITS(_Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-  ok = false; 
-} ENDTRY;
-
-if (ok && (obj != NULL)) { 
-  if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
-  AddObj_P((AnyDataObj*)obj, nobj);
-}
-#else
- try {
-   FITS_AutoReader fiar(flnm);
-   char bun[16];
-   int nhdu = fiar.NbBlocks();
-   if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
-   string name;
-   AnyDataObj* obj;
-   int kon = 1;
-   for(int k=1; k<=nhdu; k++) {
-     obj = fiar.ReadObject(k);
-     if (obj) {
-       cout << " NamedObjMgr::ReadFits() " << (string)typeid(*obj).name()
-            << "  read From HDU " << k << endl;
-       if (typeid(*obj) == typeid(DVList)) {
-         delete obj;
-         continue;
-       }
-       if (kon > 1) { 
-         sprintf(bun, "%d", kon);
-         name = nobj + bun;
-       }
-       else name = nobj;
-       AddObj_P(obj, name, false);
-       kon++;
-     }
-     else cerr << " NamedObjMgr::ReadFits()  NULL pointer from FITS_AutoReader" << endl;
-   }
- }
- catch(PThrowable & exc) {
-   cerr << " NamedObjMgr::ReadFits() / Error - Catched Exception \n " 
-        << "    Type= " << (string)typeid(exc).name()
-        << " - Msg= " << exc.Msg() << endl;
-
-   }
-#endif
-
-return;
-}
 
 /* --Methode-- */
@@ -1305 +1245 @@
 }
 
-/* --Methode-- */
-void NamedObjMgr::SaveFits(string& nom, string const & flnm)
-{
-ZSync zs(*myMutex); zs.NOp(); 
-
-NObjMgrAdapter* obja=NULL;
-obja = GetObjAdapter_P(nom);
-if (obja == NULL)  return;
-cout << "  SaveFits: Object" << nom << " to FITS file " << flnm << endl; 
-obja->SaveFits(flnm);
-return;
-}
-