Changeset 6243 for trunk/MagicSoft

Timestamp:

02/03/05 15:01:55 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (2 diffs)
• mcalib/MCalibrationTestCam.cc (modified) (1 diff)
• mjobs/calibrationref_Nov04.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -48 +48 @@
        usage!). Use an event selector, however to not skip the Process.
        This is as fast as before and now safe for any kind of extractor
-
+  
+   * mcalib/MCalibrationCam.h
+   * mcalib/MCalibrationTestCam.h
+   * mcalib/MCalibrationTestCam.cc
+     - initialize a missing array in InitAverageAreas
 
  2005/02/02 Markus Gaug

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -54 +54 @@
   virtual void AddSector(const UInt_t a, const UInt_t b);
   
+  void  InitSize               ( const UInt_t i               );
+  void  InitAverageSectors     ( const UInt_t i               );
+  virtual void  InitAverageAreas       ( const UInt_t i               );
+
 public:
 
@@ -90 +94 @@
   // Inits
   void  Init                   ( const MGeomCam &geom         );
-  void  InitSize               ( const UInt_t i               );
-  void  InitAverageAreas       ( const UInt_t i               );
-  void  InitAverageSectors     ( const UInt_t i               );
 
   // Setters

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.cc

@@ -122 +122 @@
 
 
+// -------------------------------------------------------------------
+//
+// Initialize the objects inside the TOrdCollections
+// - fAverageAreas
+// - fAverageBadAreas
+// using the virtual function Add().
+//
+// InitSize can only increase the size, but not shrink. 
+// 
+// It can be called more than one time. New Containers are 
+// added only from the current size to the argument i.
+//
+void MCalibrationTestCam::InitAverageAreas(const UInt_t i)
+{
+
+  const UInt_t save = GetAverageAreas();
+
+  if (i==save)
+    return;
+  
+  fNumUninterpolated.Set(i);
+  
+  MCalibrationCam::InitAverageAreas(i);
+  
+  return;
+  
+}
+
+
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc

@@ +1 @@
+#
+# Reference lines for the data check, valid from for data
+# from Nov. 04 on
+#
 ConvFADC2PheMin:          0.
 ConvFADC2PheMax:          4.