Changeset 709 in Sophya for trunk/SophyaPI

Timestamp:

Jan 21, 2000, 5:59:42 PM (26 years ago)

Author:

ercodmgr

Message:

petites Corrections diverses - Reza 21/01/2000

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• nobjmgr.cc (modified) (2 diffs)
• pistdimgapp.cc (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -943 +943 @@
 kw = "projprof";
 usage = "Projects (X=f(Object),Y=g(Object)) with weight WT=h(Object) into a profile histogram ";
-usage += "\n Usage: projh2d nameprof nameobj f_X() g_Y() [h_WT()=1. Cut() graphic_attributes loop_param]";
+usage += "\n Usage: projprof nameprof nameobj f_X() g_Y() [h_WT()=1. Cut() graphic_attributes loop_param]";
 usage += "\n   HProf nameprof is created if necessary ";
 usage += "\n  Related commands: projh1d projh2d ObjectExpressions ..."; 

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -21 +21 @@
 #ifdef SANS_EVOLPLANCK
 #include "fitsimage.h"  
+#else
+#include "fitsioserver.h"  
 #endif
 
@@ -840 +842 @@
 void NamedObjMgr::ReadFits(string const & flnm, string & nobj)
 {
-bool ok = true;
+bool ok = false;
+
 #ifdef SANS_EVOLPLANCK 
-RzImage* obj;
-#else
-//CMV_A_FAIRE RzImage* obj;
-#endif
-
-//  obj = RzReadFits((char*)flnm.c_str(), ImgOffX, ImgOffY, ImgSizX, ImgSizY, ImgBitSgn);
-#ifdef SANS_EVOLPLANCK 
+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) { 
+
+#else
+
+ AnyDataObj * obj=NULL;
+ FitsIoServer fios;
+ char fitsfile[512];
+ strncpy(fitsfile, flnm.c_str(), 512); fitsfile[511] = '\0';
+ int hdu = 1;
+ // Nous essayons de lire jusqu'a l'entete numero 3 
+ while (hdu < 4) {
+   try {
+     cout << "NamedObjMgr::ReadFITS() - Trying to read " << flnm 
+          << " HDU= " << hdu << endl;
+     obj = fios.loadobj(fitsfile, hdu);
+     if(obj) {
+       ok = true;
+       hdu = 9999;
+     }
+   }
+   catch(IOExc exc) {
+     cerr << "NamedObjMgr::ReadFITS() - IOExc " << exc.Msg() << endl;
+     hdu++;
+   }
+   catch(...) {
+     cerr << "NamedObjMgr::ReadFITS() - Error reading " << flnm << endl;
+     hdu++;
+     //     ok = false;
+     // hdu = 99999;
+   }
+ }
+#endif
+if (ok && (obj != NULL)) { 
   if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
   AddObj((AnyDataObj*)obj, nobj);
 }
-#else
-  printf("NamedObjMgr::ReadFITS( NON-Disponible EVOL-PLANCK) \n"); 
-#endif
 return;
 }

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -377 +377 @@
     mCmd->Interpret(s);
     }  
-  catch ( PException exc ) {
-    fflush(stdout); 
+  catch ( PThrowable exc ) {
     cout << endl; 
     cerr << endl;
-    cerr << "PIStdImgApp::Process()/ Cmd->Interpret()  Exception :" << exc.Msg() << endl;
+    cerr << "PIStdImgApp::Process()/ Cmd->Interpret() Exception :" << exc.Msg() << endl;
   }
 #endif