Changeset 8210 for trunk/MagicSoft

Timestamp:

11/02/06 19:54:22 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibCalcFromPast.cc (modified) (3 diffs)
• mcalib/MCalibCalcFromPast.h (modified) (1 diff)
• mhcalib/MHCalibrationChargeCam.cc (modified) (4 diffs)
• mimage/MNewImagePar.cc (modified) (3 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -63 +63 @@
      - removed obsolete SignalStartBin data members
      - set last hi-gain extraction slace from 15 to 16
+
+   * mcalib/MCalibCalcFromPast.[h,cc]:
+     - some changes to the log-output
+
+   * mhcalib/MHCalibrationChargeCam.cc:
+     - reformatted some output
+
+   * mraw/MRawRunHeader.cc:
+     - reset setfill in output stream
+
+   * mimage/MNewImagePar.cc:
+     - do not take unmapped pixels into account
+     - do not start with d=max_radius^2 but with FLT_MAX
 
 

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -289 +289 @@
   ReInitialize();
 
+  *fLog << all << "MCalibCalcFromPast: Calibration Update..." << flush;
+
   //
   // Finalize Possible calibration histogram classes...
   //
-  *fLog << inf << GetDescriptor() << ": Finalize calibration histograms: " << flush;
+  *fLog << inf << "Finalize calibration histograms:" << endl;
 
   // This fills the IntensityCam which are newly created by
   // ReInitialize with the result of the last calib cycle
-  if (Finalize("MHCalibrationChargeCam"))      *fLog << "MHCalibrationChargeCam..." << flush;
-  if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam..." << flush;
-  if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam..." << flush;
+  Finalize("MHCalibrationChargeCam");
+  Finalize("MHCalibrationChargeBlindCam");
+  Finalize("MHCalibrationRelTimeCam");
 
   //
@@ -360 +362 @@
 // - MHCalibrationCam::ResetHists()
 //
-Bool_t MCalibCalcFromPast::Finalize(const char* name, Bool_t finalize)
+void MCalibCalcFromPast::Finalize(const char* name, Bool_t finalize)
 {
     MHCalibrationCam *hist = (MHCalibrationCam*)fParList->FindObject(name, "MHCalibrationCam");
     if (!hist)
-        return kFALSE;
+        return;
+
+    *fLog << inf << "Finalize " << name << ":" << endl;
 
     if (finalize)
@@ -370 +374 @@
 
     hist->ResetHists();
-    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

@@ -69 +69 @@
   // MCalibCalcFromPast
   Bool_t ReInitialize();
-  Bool_t Finalize(const char* name, Bool_t finalize=kTRUE);
+  void Finalize(const char* name, Bool_t finalize=kTRUE);
 
   Bool_t UpdateMeanPhes();

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.46 2006-11-01 15:48:31 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.47 2006-11-02 19:50:53 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -960 +960 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-            *fLog << warn << "Saturated Lo Gain histogram in pixel: " << i << endl;
+              *fLog << warn << "Pixel   " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 
             if (IsOscillations())
@@ -1020 +1020 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-            *fLog << warn << "Saturated Lo Gain histogram in area idx: " << j << endl;
+              *fLog << warn << "Area    " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             if (IsOscillations())
                 histlo.CreateFourierSpectrum();
@@ -1063 +1063 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-            *fLog << warn << "Saturated Lo Gain histogram in sector: " << j << endl;
+              *fLog << warn << "Sector  " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 
             if (IsOscillations())

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -151 +151 @@
     Float_t maxpix2 = 0;                                 // [#phot]
 
-    const Double_t d = geom.GetMaxRadius()*geom.GetMaxRadius();
+    const Double_t d = FLT_MAX; //geom.GetMaxRadius()*geom.GetMaxRadius();
     Double_t dist[3] = { d, d, d };
     Int_t    idx[3]  = { -1, -1, -1};
@@ -166 +166 @@
     for (UInt_t i=0; i<npix; i++)
     {
+        const MSignalPix &pix = evt[i];
+        if (pix.IsPixelUnmapped())
+            continue;
+
         // Get geometry of pixel
         const MGeomPix &gpix = geom[i];
@@ -201 +205 @@
                 }
 
-        const MSignalPix &pix = evt[i];
         if (!pix.IsPixelUsed())
             continue;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -504 +504 @@
         *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
 
-    *fLog << dec << endl;
+    *fLog << dec << setfill(' ') << endl;
 }