Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4369)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4370)
@@ -19,4 +19,29 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/06/30: Thomas Bretz
+
+   * mbase/MEvtLoop.[h,cc]:
+     - overwrite ReadEnv with a new function taking the
+       name of the setup file as argument
+
+   * mjobs/MJPedestal.[h,cc]:
+     - added setup file name as argument to 
+
+   * mjobs/MJPedestal.[h,cc]:
+     - implemented a new data member fEnv
+     - implemented new setter SetEnv
+     - some small changes towards setup files
+     - some simplifications to line drawing
+
+   * msignal/MExtractor.[h,cc]:
+     - added ReadEnv member function
+     - removed obsolete virtual qualifiers in header
+     - simplified usage of Form()
+
+   * mraw/MRawFileWrite.[h,cc]:
+     - moved writing of RunHeaders from PreProcess to new ReInit
+
+
 
  2004/06/29: Thomas Bretz
Index: trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc	(revision 4369)
+++ trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc	(revision 4370)
@@ -174,12 +174,6 @@
     // - Branches are automatically deleted by the tree destructor
     //
-
-    //
-    // Write the run header information to the file
-    //
-    TTree *rh = new TTree("RunHeaders", "Run headers of all runs in this file");
-    rh->Branch("MRawRunHeader.", "MRawRunHeader", &fRawRunHeader, 32000);
-    rh->Fill();
-    //rh->Write();
+    fTRunHeader = new TTree("RunHeaders", "Run headers of all runs in this file");
+    fTRunHeader->Branch("MRawRunHeader.", "MRawRunHeader", &fRawRunHeader, 32000);
 
     //
@@ -229,5 +223,15 @@
     return kTRUE;
 }
-    
+
+// --------------------------------------------------------------------------
+//
+// Write the run header information to the file
+//
+Bool_t MRawFileWrite::ReInit(MParList *pList)
+{
+    fTRunHeader->Fill();
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mraw/MRawFileWrite.h
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawFileWrite.h	(revision 4369)
+++ trunk/MagicSoft/Mars/mraw/MRawFileWrite.h	(revision 4370)
@@ -31,5 +31,11 @@
     TTree *fTCalibration;           //!
 
+    TTree *fTRunHeader;             //!
+
     TFile *fOut;                    //!
+
+    Int_t  PreProcess(MParList *pList);
+    Bool_t ReInit(MParList *pList);
+    Int_t  Process();
 
 public:
@@ -41,7 +47,4 @@
     ~MRawFileWrite();
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
-
     ClassDef(MRawFileWrite, 0)	// Task to write the raw data containers to a root file
 };