Changeset 6242 for trunk/MagicSoft/Mars

Timestamp:

02/03/05 14:55:40 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (4 diffs)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (1 diff)
• mcalib/MCalibrationTestCam.h (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
      - intialize fTimeShiftHiGain and fTimeShiftLoGain by default.
  
+   * mjobs/MJPedestal.cc
+     - in case, extractor is used, put the extractor into the tasklist, 
+       otherwise ranges do not get initialized correctly (wrong memory 
+       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
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -339 +339 @@
 
     SetPulserColor ( MCalibrationCam::kNONE );
-    
+
+    fStrength    = 0.;
     fBlindPixelFlags.Set(0);
     fPINDiodeFlags  .Set(0);
@@ -1389 +1390 @@
       *fLog << inf << GetDescriptor() 
             << ": Average total phes for area idx " << aidx << ": "
-            << Form("%7.2f +- 6.2f",areaphes[aidx],TMath::Sqrt(areaweights[aidx])) << endl;
+            << Form("%7.2f +- %6.2f",areaphes[aidx],TMath::Sqrt(areaweights[aidx])) << endl;
                     
       apix.SetPheFFactorMethod   ( areaphes[aidx] );
@@ -1461 +1462 @@
           pix.SetPheFFactorMethod   ( apix.GetPheFFactorMethod()    );
           pix.SetPheFFactorMethodVar( apix.GetPheFFactorMethodVar() );
+
           if (!pix.CalcConvFFactor())
             {
@@ -1471 +1473 @@
                 bad.SetUnsuitable  ( MBadPixelsPix::kUnsuitableRun    );
             }
+
         }
     }

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -92 +92 @@
 //
 MCalibrationRelTimeCalc::MCalibrationRelTimeCalc(const char *name, const char *title)
-    : fGeom(NULL)
+    : fGeom(NULL), fFlags(0)
 {
         

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.h

@@ -34 +34 @@
                                                     const MGeomCam &cam, Int_t type=0) const;
   
+  void  InitAverageAreas       ( const UInt_t i);
+
   // Prints
   void  Print (Option_t *o="") const;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -199 +199 @@
     {
       TString dat = GetEnv("DataType", "");
+      dat = dat.Strip(TString::kBoth);
       if (dat.BeginsWith("raw", TString::kIgnoreCase))
         {

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -62 +62 @@
 #include "MExtractor.h"
 #include "MExtractTimeAndCharge.h"
+#include "MFEventSelector.h"
 
 // parameter containers
@@ -955 +956 @@
     }
 
+    MFEventSelector sel;
+    sel.SetNumSelectEvts(0);
+
+    if (fExtractionType!=kFundamental)
+      {
+        fExtractor->SetFilter(&sel);
+        tlist.AddToList(&sel);
+        tlist.AddToList(fExtractor);
+      }
+
     // ----------------------------------------------------------------------
     //   Now we make sure, that in all cases the ranges are setup correctly
@@ -1108 +1119 @@
         DisplayResult(plist);
 
+    if (fExtractionType!=kFundamental)
+      fExtractor->SetFilter(0);
+
     if (!WriteResult())
         return kFALSE;