Changeset 3094 for trunk/MagicSoft

Timestamp:

02/11/04 16:35:05 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (4 diffs)
• manalysis/MExtractSignal2.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
        one FADC slice too little, thus the normalization w.r.t. pedestals 
        was wrong. Now corrected.
+
+   * manalysis/MExtractSignal.cc
+   * manalysis/MExtractSignal2.cc
+     - when "WARNING - Lo Gain saturated" occurs, display also the corr.
+       pixel numbers.
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -60 +60 @@
 //
 MExtractSignal::MExtractSignal(const char *name, const char *title)
-  : fSaturationLimit(fgSaturationLimit)
+    : fSaturationLimit(fgSaturationLimit)
 {
 
@@ -151 +151 @@
     fSignals->Clear();
 
-    UInt_t sat=0;
+    UInt_t  sat=0;
+    TString satpixels;
 
     while (pixel.Next())
@@ -162 +163 @@
 
         if (satlo)
+          {
             sat++;
+            satpixels += Form("%d%s",pixel.GetPixelId()," ");
+          }
+        
 
         const Int_t pixid = pixel.GetPixelId();
@@ -181 +186 @@
 
     if (sat)
-        *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels." << endl;
+      *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels: " << satpixels << endl;
 
     fSignals->SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MExtractSignal2.cc

@@ -178 +178 @@
     fSignals->Clear();
 
+    TString satpixels;
     Int_t sat=0;
+
     while (pixel.Next())
     {
@@ -188 +190 @@
         FindSignal(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, sumlo, satlo);
         if (satlo)
+          {
             sat++;
-
+            satpixels += Form("%d%s",pixel.GetPixelId()," ");
+          }
+        
         //
         // Take correspodning pedestal
@@ -214 +219 @@
     //
     if (sat)
-        *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels." << endl;
+      *fLog << warn << "WARNING - Lo Gain saturated in " << sat << " pixels: " << satpixels << endl;
 
     fSignals->SetReadyToSave();