Changeset 4043 for trunk/MagicSoft/Mars

Timestamp:

05/11/04 08:55:43 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• programs/makeHillas.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -19 +19 @@
                                                  -*-*- 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

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -133 +133 @@
     return;
 
-  MPedestalCam pedcam = pedloop.GetPedestalCam();
+  //  MPedestalCam pedcam = pedloop.GetPedestalCam();
   
   /*****************************/
@@ -145 +145 @@
   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 +161 @@
   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 +215 @@
   
   plist4.AddToList(&geomcam);
-  plist4.AddToList(&pedcam);
-  plist4.AddToList(&calcam);
+  plist4.AddToList(&pedloop.GetPedestalCam());
+  plist4.AddToList(&calloop.GetCalibrationCam());
   //  plist4.AddToList(&badcam);
   plist4.AddToList(&nphot);