Changeset 12381 for fact/tools/rootmacros

Timestamp:

11/04/11 20:25:04 (13 years ago)

Author:

neise

Message:

adjusted to the new OpenDataFile() method

File:

• fact/tools/rootmacros/plotraw.C (modified) (5 diffs)

fact/tools/rootmacros/plotraw.C

@@ -8 +8 @@
 #define HAVE_ZLIB
 #include "fits.h"
+
+#include "FOpenDataFile.h"
 #include "FOpenDataFile.c"
 
@@ -20 +22 @@
 {
         gROOT->SetStyle("Plain");
-        
-        fits datafile(name);
-        if (!datafile)
-        {
-        cout << "Couldn't properly open the datafile." << endl;
-        return 1;
-        }
-        
-//-------------------------------------------
-//Get the data
-//-------------------------------------------
         vector<int16_t> data;
         vector<int16_t> data_offset;
@@ -37 +28 @@
         UInt_t data_px;
         UInt_t data_roi;
-        FOpenDataFile(datafile, data, data_offset, data_num, data_n, data_roi, data_px);
+        size_t rc_open;
+
+        fits * datafile;
+        rc_open = OpenDataFile( name, &datafile, data, data_offset, data_num, data_roi, data_px, data_n, 0);
+
+        if (rc_open == 0){
+                cout << "some error occured during file opening ... aborting." << endl;
+                return 1;
+        }
         
         
@@ -45 +44 @@
         char title[500];
         std::sprintf(title,"Data: %s, Px %i Ev %i",name,pixelnr,eventnr);
-        
-//-------------------------------------------
-//Get the event
-//-------------------------------------------
-        cout << "--------------------- Data --------------------" << endl;
-        datafile.GetRow(eventnr);
+
+        if (datafile == NULL){
+                cout << "Error: FOpenDataFile was ok, but now datafile pointer not vaild... abort." << endl;
+                return 1;
+        }
+        datafile->GetRow(eventnr);
         cout << "Event number: " << data_num << endl;
-                
-//-------------------------------------------
-//Draw the data
-//-------------------------------------------
         plotevent(title, data, data_roi, pixelnr);
+
+        delete datafile;
         return 0;
 }
@@ -82 +79 @@
         return 0;
 }
+