Index: trunk/MagicSoft/Mars/macros/readraw.C
===================================================================
--- trunk/MagicSoft/Mars/macros/readraw.C	(revision 4601)
+++ trunk/MagicSoft/Mars/macros/readraw.C	(revision 4609)
@@ -16,7 +16,7 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -24,10 +24,10 @@
 
 
-void readraw()
+void readraw(const char *fname="/data/MAGIC/Period016/mcdata/spot_1cm/standard/gamma/Gamma_zbin9_90_7_1740to1749_w0.root")
 {
     //
     // open the file
     //
-    TFile input("test.root", "READ");
+    TFile input(fname, "READ");
 
     //
@@ -46,5 +46,5 @@
     //
     MRawRunHeader *runheader = new MRawRunHeader();
-    runtree->GetBranch("MRawRunHeader")->SetAddress(&runheader);
+    runtree->GetBranch("MRawRunHeader.")->SetAddress(&runheader);
     runtree->GetEvent(0);
     runheader->Print();
@@ -53,21 +53,23 @@
     // open the Data Tree
     //
-    TTree *evttree = (TTree*) input.Get("Data") ;
+    TTree *evttree = (TTree*) input.Get("Events");
 
     //
     // create the instances of the data to read in
     //
-    MRawEvtHeader  *evtheader = new MRawEvtHeader();
-    MTime          *evttime   = new MTime();
-    MRawEvtData    *evtdata   = new MRawEvtData();
-    MRawCrateArray *evtcrate  = new MRawCrateArray();
+    MRawEvtHeader  *evtheader = 0;
+    MTime          *evttime   = 0;
+    MRawEvtData    *evtdata   = 0;
+    MRawCrateArray *evtcrate  = 0;
 
     //
     // enable the corresponding branches
     //
-    evttree->GetBranch("MRawEvtHeader")->SetAddress(&evtheader);
-    evttree->GetBranch("MTime")->SetAddress(&evttime);
-    evttree->GetBranch("MRawEvtData")->SetAddress(&evtdata);
-    evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate);
+    evttree->GetBranch("MRawEvtHeader.")->SetAddress(&evtheader);
+    evttree->GetBranch("MRawEvtData.")->SetAddress(&evtdata);
+
+    // Use this for real data only
+    //evttree->GetBranch("MTime.")->SetAddress(&evttime);
+    //evttree->GetBranch("MRawCrateArray.")->SetAddress(&evtcrate);
 
     //
@@ -83,7 +85,9 @@
 
       evtheader->Print();
-      evttime->Print();
-      evtcrate->Print();
       evtdata->Print();
+
+      // Use this for real data only
+      //evttime->Print();
+      //evtcrate->Print();
     } 
 }