Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 6095)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 6096)
@@ -52,4 +52,5 @@
 #include "MHCamera.h"
 
+#include "MGeomCamMagic.h"
 #include "MGeomCam.h"
 #include "MGeomPix.h"
@@ -1085,13 +1086,13 @@
   gr->Draw("A*");
 }
-void MCalibrationIntensityChargeCam::DrawPhePerCharge( const UInt_t pixid, const MGeomCam &geom, const MCalibrationCam::PulserColor_t col)
-{
-  TGraphErrors *gr = GetPhePerCharge(pixid,geom,col); 
+void MCalibrationIntensityChargeCam::DrawPhePerCharge( const UInt_t pixid, const MCalibrationCam::PulserColor_t col)
+{
+  TGraphErrors *gr = GetPhePerCharge(pixid,MGeomCamMagic(),col); 
   gr->SetBit(kCanDelete);
   gr->Draw("A*");
 }
-void MCalibrationIntensityChargeCam::DrawPhePerChargePerArea( const Int_t aidx, const MGeomCam &geom, const MCalibrationCam::PulserColor_t col)
-{
-  TGraphErrors *gr = GetPhePerChargePerArea(aidx,geom,col); 
+void MCalibrationIntensityChargeCam::DrawPhePerChargePerArea( const Int_t aidx, const MCalibrationCam::PulserColor_t col)
+{
+  TGraphErrors *gr = GetPhePerChargePerArea(aidx,MGeomCamMagic(),col); 
   gr->SetBit(kCanDelete);
   gr->Draw("A*");
@@ -1103,20 +1104,20 @@
   gr->Draw("A*");
 }
-void MCalibrationIntensityChargeCam::DrawRazmikPlotResults( const Int_t aidx, const MGeomCam &geom )
-{
-  TH2F *h = GetRazmikPlotResults(aidx,geom ); 
+void MCalibrationIntensityChargeCam::DrawRazmikPlotResults( const Int_t aidx)
+{
+  TH2F *h = GetRazmikPlotResults(aidx,MGeomCamMagic()); 
   h->SetBit(kCanDelete);
   h->Draw();
 }
 
-void MCalibrationIntensityChargeCam::DrawChargePerAreaVsTime( const Int_t aidx, const MGeomCam &geom )
-{
-  TGraphErrors *gr = GetChargePerAreaVsTime(aidx,geom ); 
+void MCalibrationIntensityChargeCam::DrawChargePerAreaVsTime( const Int_t aidx)
+{
+  TGraphErrors *gr = GetChargePerAreaVsTime(aidx,MGeomCamMagic()); 
   gr->SetBit(kCanDelete);
   gr->Draw("A*");
 }
-void MCalibrationIntensityChargeCam::DrawPhePerAreaVsTime( const Int_t aidx, const MGeomCam &geom )
-{
-  TGraphErrors *gr = GetPhePerAreaVsTime(aidx,geom ); 
+void MCalibrationIntensityChargeCam::DrawPhePerAreaVsTime( const Int_t aidx)
+{
+  TGraphErrors *gr = GetPhePerAreaVsTime(aidx,MGeomCamMagic()); 
   gr->SetBit(kCanDelete);
   gr->Draw("A*");
@@ -1129,7 +1130,7 @@
 }
 
-void MCalibrationIntensityChargeCam::DrawVarPerAreaVsTime( const Int_t aidx, const MGeomCam &geom, const Option_t *varname )
-{
-  TGraphErrors *gr = GetVarPerAreaVsTime(aidx,geom,varname ); 
+void MCalibrationIntensityChargeCam::DrawVarPerAreaVsTime( const Int_t aidx, const Option_t *varname )
+{
+  TGraphErrors *gr = GetVarPerAreaVsTime(aidx,MGeomCamMagic(),varname ); 
   gr->SetBit(kCanDelete);
   gr->Draw("A*");
@@ -1141,7 +1142,7 @@
   gr->Draw("A*");
 }
-void MCalibrationIntensityChargeCam::DrawVarFluctuations( const Int_t aidx, const MGeomCam &geom, const Option_t *varname)
-{
-  TH1F *h = GetVarFluctuations( aidx, geom,varname); 
+void MCalibrationIntensityChargeCam::DrawVarFluctuations( const Int_t aidx, const Option_t *varname)
+{
+  TH1F *h = GetVarFluctuations( aidx,MGeomCamMagic(),varname); 
   h->SetBit(kCanDelete);
   h->Draw();
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.h	(revision 6095)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.h	(revision 6096)
@@ -49,17 +49,17 @@
   // Draws
   void DrawRazmikPlot( const UInt_t pixid );
-  void DrawPheVsCharge( const UInt_t pixid, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);                             // *MENU*
-  void DrawPhePerCharge( const UInt_t pixid, const MGeomCam &geom, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);      // *MENU*
-  void DrawPhePerChargePerArea( const Int_t aidx, const MGeomCam &geom, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE); // *MENU*
-  void DrawPheVsChargePerArea( const Int_t aidx, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);                        // *MENU*
-  void DrawRazmikPlotResults( const Int_t aidx, const MGeomCam &geom );                          // *MENU*
+  void DrawPheVsCharge( const UInt_t pixid, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);       // *MENU*
+  void DrawPhePerCharge( const UInt_t pixid, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);      // *MENU*
+  void DrawPhePerChargePerArea( const Int_t aidx, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE); // *MENU*
+  void DrawPheVsChargePerArea( const Int_t aidx, const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE);  // *MENU*
+  void DrawRazmikPlotResults( const Int_t aidx );                          // *MENU*
 
-  void DrawChargePerAreaVsTime( const Int_t aidx, const MGeomCam &geom );                        // *MENU*
-  void DrawPhePerAreaVsTime( const Int_t aidx, const MGeomCam &geom );                           // *MENU*
-  void DrawPhotVsTime( const Option_t *method="FFactor" );                                       // *MENU*
+  void DrawChargePerAreaVsTime( const Int_t aidx);                         // *MENU*
+  void DrawPhePerAreaVsTime( const Int_t aidx );                           // *MENU*
+  void DrawPhotVsTime( const Option_t *method="FFactor");                  // *MENU*
 
-  void DrawVarPerAreaVsTime( const Int_t aidx, const MGeomCam &geom, const Option_t *varname );  // *MENU*
-  void DrawVarVsTime( const Int_t pixid , const Option_t *varname );                             // *MENU*
-  void DrawVarFluctuations( const Int_t aidx, const MGeomCam &geom, const Option_t *varname);    // *MENU*
+  void DrawVarPerAreaVsTime( const Int_t aidx, const Option_t *varname );  // *MENU*
+  void DrawVarVsTime( const Int_t pixid , const Option_t *varname );       // *MENU*
+  void DrawVarFluctuations( const Int_t aidx, const Option_t *varname);    // *MENU*