Changeset 8582 for trunk/MagicSoft/Mars

Timestamp:

06/19/07 10:35:33 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.rc (modified) (1 diff)
• callisto_Dec04Jan05.rc (modified) (1 diff)
• mbase/MEnv.h (modified) (1 diff)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (4 diffs)
• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (4 diffs)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mjobs/MJSpectrum.cc (modified) (1 diff)
• mjobs/MJStar.cc (modified) (2 diffs)
• mpedestal/MExtractPedestal.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)
• msignal/MExtractor.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/06/19 Thomas Bretz
+
+   * callisto.rc, callisto_Dec04Jan05.rc:
+     - changed the default values (commented out anyhow) to the real
+       values.
+       
+   * mbase/MEnv.h:
+     - allow printing contents from the context menu
+
+   * mcalib/MCalibrationRelTimeCalc.cc:
+     - replaced kDeviatingTimeResolution by new kDeviatingRelTimeResolution
+
+   * mhcalib/MHCalibrationPulseTimeCam.cc:
+     - automatically scale the saturation limit to the fadc range
+
+   * mjobs/MJCalibrateSignal.cc:
+     - save resource file into signal*.root file
+     - added some code (still commented) for saving the calibration
+       results
+     - do not fill the bad-pixel plots with MCs
+
+   * mjobs/MJCalibration.cc:
+     - save resource file into signal*.root file
+
+   * mjobs/MJPedestal.cc:
+     - clarified output for "mean pulse time" further
+
+   * mpedestal/MExtractPedestal.cc:
+     - automatically scale the maximum variation and the 
+       maximum value to fit the FADC range
+
+   * mraw/MRawRunHeader.h:
+     - added a function returnung the maximum value of the FADC
+     - changed the GetScale from a calculation to a switch 
+       (faster and easier to understand)
+
+   * msignal/MExtractor.cc:
+     - get the maximum in case of no lo-gains from the run-header
+
+
 
  2007/06/18 Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -7 +7 @@
      Also the old values seemed not exactly the PulsePos used for 
      teh check.
+
+   - general: Now the output files (calib*.root, etc) also contain the
+     resource file (to check it open it in the TBrowser and choose Print()
+     from the context menu)
 
    - callisto: improved calculation of spline coefficients a lot. This

trunk/MagicSoft/Mars/callisto.rc

@@ -311 +311 @@
 # Define the Pulse Position check parameters:
 # -------------------------------------------------------------------------
-#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  255
-#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit: 100
-#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired: 2
+#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  245
+#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit:  85
+#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  2
 #MJPedestalY2.PixelCheck: no
 

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -339 +339 @@
 # Define the Pulse Position check parameters:
 # -------------------------------------------------------------------------
-#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  255
-#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit: 100
-#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired: 2
+#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  245
+#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit:  85
+#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  2
 #MJPedestalY2.PixelCheck: no
 

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -67 +67 @@
     void        AddEnv(const TEnv &env, Bool_t overwrite=kTRUE);
 
+    void        Print(Option_t *option) const { TEnv::Print(option); }
+    void        Print() const { TEnv::PrintEnv(kEnvLocal); } //*MENU*
+
     void PrintUntouched() const;
     Int_t GetNumUntouched() const;

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -227 +227 @@
   *fLog << GetDescriptor() << ": Errors statistics:" << endl;  
 
-  PrintUncalibrated(MBadPixelsPix::kDeviatingTimeResolution,    
+  PrintUncalibrated(MBadPixelsPix::kDeviatingRelTimeResolution,
                     Form("%s%2.1f%s","Rel.time rms more than ", fRelTimeResolutionLimit, " dev from median:"));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
@@ -309 +309 @@
             {
                 *fLog << warn << "Pixel  " << setw(4) << i << ": Rel-time rms could not be calculated." << endl;
-                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingRelTimeResolution);
                 continue;
             }
@@ -320 +320 @@
                     << Form("[%4.2f,%4.2f]", lolim, hilim) << endl;
 
-                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingRelTimeResolution);
             }
         }
@@ -342 +342 @@
 
       if (IsCheckDeviatingBehavior())
-          if (bad.IsUncalibrated(MBadPixelsPix::kDeviatingTimeResolution))
+          if (bad.IsUncalibrated(MBadPixelsPix::kDeviatingRelTimeResolution))
               bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.40 2007-06-12 20:49:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.41 2007-06-19 09:25:38 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -394 +394 @@
 
         // Check for saturation
-        if (evt->GetSaturation(idx, fSaturationLimit)>0)
+        if (evt->GetSaturation(idx, fSaturationLimit*fRunHeader->GetScale())>0)
             continue;
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -151 +151 @@
     // file always. Which might make the usage outside of
     // callisto difficult.
+    TObjArray cont;
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
     const TString name(Form("signal%08d.root", fSequence.GetSequence()));
-    return WriteDisplay(name, "UPDATE");
+    return WriteContainer(cont, name, "UPDATE");
 }
 
@@ -675 +681 @@
     writemc.AddContainer("MMcEvtBasic", "OriginalMC");
 
+    // Write the special calib tree
+    /*
+    MWriteRootFile writecal(2, fname, fOverwrite?"RECREATE":"NEW");
+    writecal.SetName("WriteCalib");
+    writecal.AddContainer("MBadPixelsCam",          "Calib");
+    writecal.AddContainer("MCalibrationChargeCam",  "Calib");
+    writecal.AddContainer("MCalibrationRelTimeCam", "Calib");
+    */
+
     // Now setup tasklist for events
     MTaskList tlist2;
@@ -722 +737 @@
         if (fIsRelTimesUpdate)
             tlist3.AddToList(&recalc); // MCalibrationRelTimeCam
-    }  
+
+        //tlist3.AddToList(&writecal);   // MWriteRootFile
+    }
 
     // Continue for all non-cosmic events
@@ -761 +778 @@
     //    tlist2.AddToList(&fill7);
     tlist2.AddToList(&fill9);
-    tlist2.AddToList(&fillB);
-    tlist2.AddToList(&fillD);
+    if (!fSequence.IsMonteCarlo())
+    {
+        tlist2.AddToList(&fillB);
+        tlist2.AddToList(&fillD);
+    }
     if (extractor1->HasLoGain())
     {

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -2027 +2027 @@
         cont.Add(fDisplay);
 
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
     return WriteContainer(cont, GetOutputFileName(), "UPDATE");
 }

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -319 +319 @@
     if (fDisplay)
         arr.Add(fDisplay);
+
+    arr.Add(const_cast<TEnv*>(GetEnv()));
 
     return WriteContainer(arr, fname, "UPDATE");

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -895 +895 @@
         return kFALSE;
 
-    *fLog << all << "Mean pulse time (" << (fSequence.IsMonteCarlo()?"MC":"cosmics") << "): ";
+    *fLog << all << "Mean pulse time/Avg pos.of maximum (" << (fSequence.IsMonteCarlo()?"MC":"cosmics") << "): ";
     *fLog << meanpulsetime << "+-" << rmspulsetime << endl;
 

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1322 +1322 @@
 
     // check if output should be written
-    if (!fPathOut.IsNull())
-        fDisplay->SaveAsRoot(fPathOut);
-
-    return kTRUE;
-}
+    if (fPathOut.IsNull())
+        return kTRUE;
+
+    // Write the output
+    TObjArray cont;
+    cont.Add((TObject*)GetEnv());
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
+    return WriteContainer(cont, fPathOut, "RECREATE");
+}

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -103 +103 @@
     }
 
+    TObjArray cont;
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
     const TString oname = Form("%s/star%08d.root", (const char*)fPathOut, fSequence.GetSequence());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "RECREATE");
-
-    *fLog << inf << " - MStatusDisplay..." << flush;
-    if (fDisplay && fDisplay->Write()<=0)
-    {
-        *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
-        return kFALSE;
-    }
-    *fLog << inf << "ok." << endl;
-
-    return kTRUE;
+    return WriteContainer(cont, oname, "UPDATE");
 }
 
@@ -345 +338 @@
     // Spark cut
     MFDataPhrase fsparks("log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596", "SparkCut");
+    //fill0b.SetFilter(&fsparks);
     fill0c.SetFilter(&fsparks);
 

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.32 2007-06-16 21:59:19 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.33 2007-06-19 09:25:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -620 +620 @@
     }
 
+    max /= fRunHeader->GetScale();
+    min /= fRunHeader->GetScale();
+
     // If the maximum in the high gain window is smaller than
-    // FIXME: Precompiled value!
     return max-min<fMaxSignalVar && max<fMaxSignalAbs;
 }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -115 +115 @@
     UShort_t GetNumNormalPixels() const;
     UShort_t GetNumSpecialPixels() const;
-    UInt_t   GetScale() const { return 1<<((fNumBytesPerSample-1)*8); }
+    UInt_t   GetScale() const { switch (fNumBytesPerSample) { case 1: return 0x1; case 2: return 0x100; case 4: return 0x1000000; } return 0; }
+    UInt_t   GetMax() const { switch (fNumBytesPerSample) { case 1: return 0xff; case 2: return 0xffff; case 4: return 0xffffffff; } return 0; }
 
     UInt_t GetNumSamplesPerCrate() const

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -251 +251 @@
         fLoGainFirst=0;
         fLoGainLast =0;
-        if (fSaturationLimit>0xff)
+        if (fSaturationLimit>fRunHeader->GetMax())
         {
-            *fLog << " and saturation limit";
-            fSaturationLimit=0xff;
+            *fLog << " and saturation limit to " << fRunHeader->GetMax();
+            fSaturationLimit=fRunHeader->GetMax();
         }
         *fLog << "." << endl;