Changeset 3964

Timestamp:

05/04/04 18:16:22 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• Makefile.conf.linux (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

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

trunk/MagicSoft/Mars/Makefile

@@ -21 +21 @@
 
 #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 +65 @@
           mhistmc \
           mjobs \
+          mtemp/mifae/library \
           mtools
 

trunk/MagicSoft/Mars/Makefile.conf.linux

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

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -149 +149 @@
     if (!fCerPhotEvt)
         return kFALSE;
-    
+
+    fGeomCam = (MGeomCam*)pList->FindCreateObj(AddSerialNumber("MGeomCam"));
+    if (!fGeomCam)
+      return kFALSE;
+
     return kTRUE;
 }
@@ -192 +196 @@
       }
   }
-
-
 
 
@@ -364 +366 @@
           hiloconv       = 1.;
           hiloconverr    = 0.;
-          calibConv      = 1.;
+          calibConv      = 1./fGeomCam->GetPixRatio(pixidx);
           calibConvVar   = 0.;
           calibFFactor   = 0.;