Index: /fact/tools/rootmacros/plotraw.C
===================================================================
--- /fact/tools/rootmacros/plotraw.C	(revision 12380)
+++ /fact/tools/rootmacros/plotraw.C	(revision 12381)
@@ -8,4 +8,6 @@
 #define HAVE_ZLIB
 #include "fits.h"
+
+#include "FOpenDataFile.h"
 #include "FOpenDataFile.c"
 
@@ -20,15 +22,4 @@
 {
 	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,5 +28,13 @@
 	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,16 +44,14 @@
 	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,2 +79,3 @@
 	return 0;
 }
+