Index: trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc	(revision 7804)
@@ -227,7 +227,7 @@
 void MCalibConstCam::Clear(Option_t *o)
 {
-    { fArray->ForEach(TObject, Clear)(); }
-    { fAverageAreas->ForEach(TObject, Clear)(); }
-    { fAverageSectors->ForEach(TObject, Clear)(); }
+    { fArray->R__FOR_EACH(TObject, Clear)(); }
+    { fAverageAreas->R__FOR_EACH(TObject, Clear)(); }
+    { fAverageSectors->R__FOR_EACH(TObject, Clear)(); }
   
 }
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 7804)
@@ -845,5 +845,5 @@
 // gui elements to a macro-file.
 //
-void MCalibrateData::StreamPrimitive(ofstream &out) const
+void MCalibrateData::StreamPrimitive(ostream &out) const
 {
     out << "   " << ClassName() << " " << GetUniqueName() << "(\"";
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 7804)
@@ -97,5 +97,5 @@
   Int_t  Process();
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
-  void   StreamPrimitive(ofstream &out) const;
+  void   StreamPrimitive(ostream &out) const;
   
 public:
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc	(revision 7804)
@@ -171,5 +171,5 @@
 
   fPulserColor = col;
-  fPixels->ForEach(MCalibrationBlindPix, SetColor)(col);
+  fPixels->R__FOR_EACH(MCalibrationBlindPix, SetColor)(col);
 
 }
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 7804)
@@ -170,10 +170,7 @@
 void MCalibrationCam::Clear(Option_t *o)
 {
-
-  {  fPixels        ->ForEach(TObject, Clear)();  }
-  {  fAverageAreas  ->ForEach(TObject, Clear)();  }
-  {  fAverageSectors->ForEach(TObject, Clear)();  }
-  
-  return;
+    { fPixels        ->R__FOR_EACH(TObject, Clear)();  }
+    { fAverageAreas  ->R__FOR_EACH(TObject, Clear)();  }
+    { fAverageSectors->R__FOR_EACH(TObject, Clear)();  }
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc	(revision 7804)
@@ -187,6 +187,6 @@
 void MCalibrationIntensityCam::Clear(Option_t *o)
 {
-    fCams->ForEach(MCalibrationCam, Clear)();
-    fHists->ForEach(MHCalibrationCam, Clear)();
+    fCams->R__FOR_EACH(MCalibrationCam, Clear)();
+    fHists->R__FOR_EACH(MHCalibrationCam, Clear)();
 }
 
@@ -197,6 +197,6 @@
 void MCalibrationIntensityCam::Print(Option_t *o) const
 {
-    fCams->ForEach(MCalibrationCam, Print)(o);
-    fHists->ForEach(MHCalibrationCam, Print)(o);
+    fCams->R__FOR_EACH(MCalibrationCam, Print)(o);
+    fHists->R__FOR_EACH(MHCalibrationCam, Print)(o);
 }
 
@@ -244,5 +244,5 @@
     InitSize(1);
 
-  fCams->ForEach(MCalibrationCam,Init)(geom);
+  fCams->R__FOR_EACH(MCalibrationCam,Init)(geom);
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityConstCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityConstCam.cc	(revision 7575)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityConstCam.cc	(revision 7804)
@@ -113,7 +113,5 @@
 void MCalibrationIntensityConstCam::Clear(Option_t *o)
 {
-
-  fCams->ForEach(MCalibConstCam, Clear)(); 
-  return;
+  fCams->R__FOR_EACH(MCalibConstCam, Clear)();
 }
 
@@ -124,5 +122,5 @@
 void MCalibrationIntensityConstCam::Print(Option_t *o) const
 {
-  fCams->ForEach(MCalibConstCam, Print)(o); 
+  fCams->R__FOR_EACH(MCalibConstCam, Print)(o);
 }
 
@@ -160,5 +158,5 @@
     InitSize(1);
 
-  fCams->ForEach(MCalibConstCam,Init)(geom);
+  fCams->R__FOR_EACH(MCalibConstCam,Init)(geom);
 }