Index: trunk/MagicSoft/Mars/mtemp/mifae/Changelog
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4042)
+++ trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4043)
@@ -19,8 +19,14 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/05/11: Javier Rico
+   * programs/makeHillas.cc
+     - prevent it from bombing because of the mjobs
+
+
  2004/05/10: Javier Rico
    * programs/Makefile
      - specify libmars.so with absolute path
 
+	
  2004/05/07: Javier Rico
    * programs/pedvsslices.cc
Index: trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4042)
+++ trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4043)
@@ -133,5 +133,5 @@
     return;
 
-  MPedestalCam pedcam = pedloop.GetPedestalCam();
+  //  MPedestalCam pedcam = pedloop.GetPedestalCam();
   
   /*****************************/
@@ -145,8 +145,8 @@
   calloop.SetQECam(qecam);
   calloop.SetBadPixels(pedloop.GetBadPixels());
-  if (!calloop.Process(pedcam))
+  if (!calloop.Process(pedloop.GetPedestalCam()))
     return;
 
-  MCalibrationChargeCam calcam = calloop.GetCalibrationCam();
+  //  MCalibrationChargeCam calcam = calloop.GetCalibrationCam();
 
   /************************************************************************/
@@ -161,8 +161,8 @@
   MPedPhotCam         nphotrms;
   MExtractedSignalCam sigcam;
-  
+
   plist3.AddToList(&geomcam);
-  plist3.AddToList(&pedcam);
-  plist3.AddToList(&calcam);
+  plist3.AddToList(&pedloop.GetPedestalCam());
+  plist3.AddToList(&calloop.GetCalibrationCam());
   plist3.AddToList(&badcam);
   plist3.AddToList(&sigcam);
@@ -215,6 +215,6 @@
   
   plist4.AddToList(&geomcam);
-  plist4.AddToList(&pedcam);
-  plist4.AddToList(&calcam);
+  plist4.AddToList(&pedloop.GetPedestalCam());
+  plist4.AddToList(&calloop.GetCalibrationCam());
   //  plist4.AddToList(&badcam);
   plist4.AddToList(&nphot);