Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3963)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3964)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/04: Javier Rico
+ 
+   * mcalib/MCalibrate.cc
+     - when calibrating using kNONE, weight by the pixel area
+	
 
  2004/05/04: Thomas Bretz
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 3963)
+++ trunk/MagicSoft/Mars/Makefile	(revision 3964)
@@ -21,5 +21,5 @@
 
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readdaq readraw merpp star status mars mona
+PROGRAMS = readdaq readraw merpp star status mars mona mtemp/mifae/programs/makeHillas
 SOLIB    = libmars.so
 CINT     = M
@@ -65,4 +65,5 @@
           mhistmc \
           mjobs \
+          mtemp/mifae/library \
           mtools
 
Index: trunk/MagicSoft/Mars/Makefile.conf.linux
===================================================================
--- trunk/MagicSoft/Mars/Makefile.conf.linux	(revision 3963)
+++ trunk/MagicSoft/Mars/Makefile.conf.linux	(revision 3964)
@@ -19,5 +19,5 @@
 OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual
 # ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
-DEBUG    = 
+DEBUG    = -g
 ARCHDEF  = -D__LINUX__
 DYNLIB   = -shared
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3963)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3964)
@@ -149,5 +149,9 @@
     if (!fCerPhotEvt)
         return kFALSE;
-    
+
+    fGeomCam = (MGeomCam*)pList->FindCreateObj(AddSerialNumber("MGeomCam"));
+    if (!fGeomCam)
+      return kFALSE;
+
     return kTRUE;
 }
@@ -192,6 +196,4 @@
       }
   }
-
-
 
 
@@ -364,5 +366,5 @@
 	  hiloconv       = 1.;
 	  hiloconverr    = 0.;
-	  calibConv      = 1.;
+	  calibConv      = 1./fGeomCam->GetPixRatio(pixidx);
 	  calibConvVar   = 0.;
 	  calibFFactor   = 0.;