Changeset 3667 for trunk

Timestamp:

04/06/04 13:58:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• NEWS (modified) (1 diff)
• manalysis/MGeomApply.cc (modified) (2 diffs)
• manalysis/MHPedestalCam.cc (modified) (2 diffs)
• mcalib/MCalibrationCam.cc (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (2 diffs)
• mcalib/MHCalibrationCam.cc (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (2 diffs)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)
• mreport/MReportDrive.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/04/06: Thomas Bretz
+
+   * mcalib/MCalibrationCam.[h,cc]:
+     - simplified call to initialization by new function Init()
+
+   * mcalib/MH*.cc:
+     - fixed some warnings (comparision between signed and unsigned)
+
+   * manalysis/MGeomApply.cc:
+     - use new Init-funtion of MCalibrationCam
+
+   * mastro/MAstro.cc:
+     - some fixes to the conversion functions
+
+   * mastro/MAstroCamera.[h,cc]:
+     - added comments
+     - changed argument type of AddPrimitives
+     
+   * mastro/MAstroCatalog.[h,cc]:
+     - many changes to make it possible to overlay the
+       catalog on top of a 2D histogram
+     
+   * mbase/MEvtLoop.cc:
+     - fixed estimation of run-time
+
+   * mbase/MMath.[h,cc]:
+     - added member functions for signed significances
+
+   * mbase/MParContainer.cc:
+     - changed GetterMethod() to support double reference data mebers
+
+   * mbase/MStatusDisplay.cc:
+     - removed some obsolete debug outputs
+
+   * mbase/MTask.[h,cc]:
+     - removed fNumExecutions, fStopwatch already counts the calls
+     - slight chagnes to output of PrintStatistics
+
+   * mbase/MTaskList.[h,cc]:
+     - slight chagnes to output of PrintStatistics
+     
+   * mbase/MTime.cc:
+     - removed +TwoPi from GetGmst
+
+   * mcamera/MCameraAUX.h, mcamera/MCameraHV.h, mcamera/MCameraLV.h,
+     mcamera/MCameraLid.h, mcamera/MCameraLids.h,
+     mcamera/MCameraPowerSupply.h:
+     - added missing Getter functions
+
+   * mcamera/MCameraHV.h:
+     - removed obsolete data-meber fMean
+
+   * mdata/DataLinkDef.h:
+     - added MDataFormula
+
+   * mdata/MDataChain.cc, mdata/Makefile:
+     - enhanced dosumentation
+     - implemented use of multi argument functions
+     - added ^-operator
+
+   * mdata/MDataList.[h,cc]:
+     - added ^-operator
+     - enhanced IsValid
+
+   * mfbase/MFilterList.cc:
+     - changed a warn-output to inf
+
+   * mgeom/MGeomCam.[h,cc]:
+     - added getter returning index corresponding to XY
+
+   * mgeom/MGeomPix.[h,cc]:
+     - added getter IsInside
+
+   * mhist/MHCamera.cc:
+     - Return 0 in GetMean if no entries
+
+   * mhist/MHFalseSource.[h,cc]:
+     - removed conversion stuff (mm/deg) 
+     - slight change to calculation of significance
+     - added dist-cuts
+     - added histogram showing number of entries
+     - added display of catalog
+
+   * mhist/MHStarMap.cc:
+     - added comment
+     
+   * mimage/MHillasExt.[h,cc]:
+     - changed class version to 3
+     - added new data-member fMaxDist
+     
+   * mimage/MNewImagePar.[h,cc]:
+     - added new data member fUsedArea and fCoreArea
+
+   * mmc/MMcConfigRunHeader.h:
+     - readded GetMirrors (WHY WAS IT GONE?)
+
+   * mpointing/MPointingPos.[h,cc]
+     - implemented Getter to get coordinates in rad
+     
+   * mpointing/MSrcPosCalc.[h,cc]:
+     - fixed direction of rotation
+     - for the moment do use fTime
+
+
 
  2004/04/06: Markus Gaug
@@ -856 +961 @@
 
    * mcalib/MCalibrationChargeCam.[h,cc]
-   * mcalib/MCalibrationChargePix.h
-   * mcalib/MCalibrationChargeCalc.cc
+     mcalib/MCalibrationChargePix.h, mcalib/MCalibrationChargeCalc.cc:
      - removed pointers to MGeomCam and MBadPixelsCam in MCalibrationChargeCam
      - use two loops over pixels in order to determine mean flux of phe;s to 

trunk/MagicSoft/Mars/NEWS

@@ -1 +1 @@
                                                                -*-*- END -*-*-
  *** Version <cvs>
-  
+
+   - implementes multi-argument support in MDataChain
+     ("pow(a, b)")
+
+   - implemented double reference support in MDataChain
+     ("MCameraLV.fPowerSupplyA.fVoltagePos5V")
+
    - added support in MF for expressiond like 
      "MHillas.fWidth<2*<MHillas.fLength"

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -75 +75 @@
 #include "MGeomCam.h"
 #include "MPedestalCam.h"
-#include "MCalibrationChargeCam.h"
-#include "MCalibrationRelTimeCam.h"
-#include "MCalibrationQECam.h"
-#include "MCalibrationPedCam.h"
+#include "MCalibrationCam.h"
 #include "MPedPhotCam.h"
 #include "MExtractedSignalCam.h"
@@ -140 +137 @@
         ped->InitSize(cam->GetNumPixels());
 
-    MCalibrationChargeCam *cal = 
-      (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+    MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
-      {
-        cal->InitSize          ( cam->GetNumPixels()  );
-        cal->InitAverageAreas  ( cam->GetNumAreas()   );
-        cal->InitAverageSectors( cam->GetNumSectors() );
-      }
+        cal->Init(*cam);
 
-    MCalibrationRelTimeCam *cat = 
-      (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
+    MCalibrationCam *cat = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (cat)
-      {
-        cat->InitSize          ( cam->GetNumPixels()  );
-        cat->InitAverageAreas  ( cam->GetNumAreas()   );
-        cat->InitAverageSectors( cam->GetNumSectors() );
-      }
-    
-    MCalibrationQECam *qe = 
-      (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+        cat->Init(*cam);
+
+    MCalibrationCam *qe = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-      {
-        qe->InitSize           ( cam->GetNumPixels()  );
-        qe->InitAverageAreas   ( cam->GetNumAreas()   );
-        qe->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
-    MCalibrationPedCam *pcam = 
-      (MCalibrationPedCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
+        qe->Init(*cam);
+
+    MCalibrationCam *pcam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
     if (pcam)
-      {
-        pcam->InitSize           ( cam->GetNumPixels()  );
-        pcam->InitAverageAreas   ( cam->GetNumAreas()   );
-        pcam->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
+        pcam->Init(*cam);
+
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)
         pedphot->InitSize(cam->GetNumPixels());
 
-
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
         ext->InitSize(cam->GetNumPixels());
-
 
     MBlindPixels *bnd = (MBlindPixels*)pList->FindObject(AddSerialNumber("MBlindPixels"));

trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc

@@ -189 +189 @@
   fCam = (MCalibrationCam*)pList->FindObject("MCalibrationPedCam");
   if (!fCam)
-    {
+  {
       fCam = (MCalibrationCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationPedCam"));
       if (!fCam)
-        {
-          gLog << err << "Cannot find nor create MCalibrationPedCam ... abort." << endl;
           return kFALSE;
-        }
-      else 
-        {
-          fCam->InitSize(npixels);
-          fCam->InitAverageAreas(nareas);
-          fCam->InitAverageSectors(nsectors);
-        }
-    }
+
+      fCam->Init(*fGeom);
+  }
   
   Float_t sliceshi = signal->GetNumUsedHiGainFADCSlices();
@@ -369 +362 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
-
-  Float_t sumareahi  [nareas],   sumarealo  [nareas];
-  Float_t sumsectorhi[nsectors], sumsectorlo[nsectors];
-  Int_t   numareahi  [nareas],   numarealo  [nareas];
-  Int_t   numsectorhi[nsectors], numsectorlo[nsectors];
-
-  for (UInt_t j=0; j<nareas; j++)
-    {
-      sumareahi[j] = sumarealo[j] = 0.;
-      numareahi[j] = numarealo[j] = 0;
-    }
-  
-  for (UInt_t j=0; j<nsectors; j++)
-    {
-      sumsectorhi[j] = sumsectorlo[j] = 0.;
-      numsectorhi[j] = numsectorlo[j] = 0;
-    }
-  
-
-  for (Int_t i=0; i<npixels; i++)
-    {
-
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
+
+  TArrayF sumareahi(nareas);
+  TArrayF sumarealo(nareas);
+  TArrayF sumsectorhi(nsectors);
+  TArrayD sumsectorlo(nsectors);
+  TArrayI numareahi(nareas);
+  TArrayI numarealo(nareas);
+  TArrayI numsectorhi(nsectors);
+  TArrayI numsectorlo(nsectors);
+
+  for (UInt_t i=0; i<npixels; i++)
+  {
       MHGausEvents &histhi = (*this)[i];
       MHGausEvents &histlo = (*this)(i);
 
       if (histhi.IsExcluded())
-        continue;
+          continue;
 
       const MExtractedSignalPix &pix = (*signal)[i];
-      
+
       const Float_t pedhi = pix.GetExtractedSignalHiGain();
       const Float_t pedlo = pix.GetExtractedSignalLoGain();

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -196 +196 @@
 }
 
+void MCalibrationCam::Init(const MGeomCam &geom)
+{
+    InitSize          (geom.GetNumPixels() );
+    InitAverageAreas  (geom.GetNumAreas()  );
+    InitAverageSectors(geom.GetNumSectors());
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -14 +14 @@
 class MBadPixelsPix;
 class MBadPixelsCam;
+class MGeomCam;
+
 class MCalibrationCam : public MParContainer, public MCamEvent
 {
@@ -31 +33 @@
   
   virtual void Clear(    Option_t *o="" );
+  void Init(const MGeomCam &geom);
   void InitSize( const UInt_t i );
   void InitAverageAreas(  const UInt_t i );

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -639 +639 @@
 {
   
-  for (Int_t j=0; j<fGeom->GetNumAreas(); j++)
+  for (UInt_t j=0; j<fGeom->GetNumAreas(); j++)
     {
   

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -387 +387 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
-  const Int_t lofirst  = signal->GetFirstUsedSliceLoGain();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
+  const UInt_t lofirst  = signal->GetFirstUsedSliceLoGain();
 
   Float_t sumhiarea  [nareas],   sumloarea  [nareas],   timehiarea  [nareas],   timeloarea  [nareas];
@@ -410 +410 @@
   
 
-  for (Int_t i=0; i<npixels; i++)
+  for (UInt_t i=0; i<npixels; i++)
     {
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -297 +297 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
 
   Float_t sumareahi  [nareas],   sumarealo  [nareas];

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -289 +289 @@
     }
 
-    return Profile(mean/n);
+    return n==0 ? 0 : Profile(mean/n);
 }
 
@@ -316 +316 @@
         }
     }
+
+    if (n==0)
+        return 0;
 
     sum /= n;

trunk/MagicSoft/Mars/mreport/MReportDrive.cc

@@ -81 +81 @@
 {
     fName  = "MReportDrive";
-    fTitle = "Class for DRIVE-REPORT information";
+    fTitle = "Class for DRIVE-REPORT information (raw telescope position)";
 }