Changeset 16991 for fact/tools/pyscripts/pyfact

Timestamp:

07/30/13 20:13:30 (11 years ago)

Author:

kraehenb

Message:

CalFactFitsTest.py: Fixed error on some systems about missing dictionary
calfactfits.h: Added possibility to open old DRS files without NROI

File:

• fact/tools/pyscripts/pyfact/calfactfits.h (modified) (3 diffs)

fact/tools/pyscripts/pyfact/calfactfits.h

@@ -2 +2 @@
 //
 // Class CalFactFits
-// Wrapper class for fits.h or pyfits.h
+// Wrapper class for factfits.h (or fits.h, pyfits.h)
 // Provides fast access to calibrated events of FACT raw files
 //
@@ -17 +17 @@
 // root [3] .L calfactfits.h++
 // 
+// Try /usr/lib/x86_64-linux-gnu/libz.so at ETH for the libz.so file.
+//
 // Note: the produced izstream_h.so must be in LD_LIBRARY_PATH, e.g.
 // export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/guest/kraehenb/software/PythonIncludes/
@@ -101 +103 @@
                 //Read basic parameters of the two files
 //              std::cout << "...Reading basic file parameters..." << std::endl;
-                calib_nroi = calibfile.GetUInt("NROI");
-                calib_npix = calibfile.GetUInt("NPIX");
+                try {
+                        calib_nroi = calibfile.GetUInt("NROI");
+                }
+                catch(runtime_error &err) {
+                        std::cout << err.what() << std::endl;
+                        std::cout << "Standard value NROI=1024 assumed." << std::endl;
+                        calib_nroi = 1024;
+                }
+                try {
+                        calib_npix = calibfile.GetUInt("NPIX");
+                }
+                catch(runtime_error &err) {
+                        std::cout << err.what() << std::endl;
+                        std::cout << "Standard value NPIX=1440 assumed." << std::endl;
+                        calib_npix = 1440;
+                }
+                
                 data_nroi = datafile.GetUInt("NROI");
                 data_npix = datafile.GetUInt("NPIX");