Changeset 4984 for trunk

Timestamp:

09/13/04 17:09:18 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractBlindPixel.cc (modified) (1 diff)
• MExtractFixedWindow.cc (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -315 +315 @@
 
   *fLog << endl;
-  *fLog << inf << ": Extracting "
-        << Form("%s",IsExtractionType(kAmplitude) ? "Amplitude " : " Integral ")
-        << " using " << range << " FADC samples from " 
-        << Form("%s%2i",fHiLoFirst ? "Low Gain slice " : " High Gain slice ",
-                fHiLoFirst ? (Int_t)fHiLoFirst : (Int_t)fHiGainFirst) 
-        << " to (including)  " 
-        << Form("%s%2i",fHiLoLast ? "Low Gain slice " : " High Gain slice ",
-                fHiLoLast ?  (Int_t)fHiLoLast-1 : (Int_t)fHiGainLast ) 
-        << endl;
+  *fLog << inf << "Extracting "
+      << (IsExtractionType(kAmplitude) ? "Amplitude" : " Integral")
+      << " using " << range << " FADC samples from "
+      << (fHiLoFirst ? "Low Gain slice" : " High Gain slice")
+      << (fHiLoFirst ? (Int_t)fHiLoFirst : (Int_t)fHiGainFirst)
+      << " to (including) "
+      << (fHiLoLast ? "Low Gain slice" : "High Gain slice")
+      << (fHiLoLast ?  (Int_t)fHiLoLast-1 : (Int_t)fHiGainLast)
+      << endl;
 
   if (IsExtractionType(kFilter))
-    *fLog << inf << GetDescriptor() << ": Will use Filter using " 
-          << (Int_t)(fLoGainLast-fLoGainFirst+1) << " FADC slices " 
-          << "from High Gain slice " << (Int_t)fLoGainFirst 
+    *fLog << inf << "Will use Filter using "
+          << (Int_t)(fLoGainLast-fLoGainFirst+1) << " FADC slices"
+          << " from High Gain slice " << (Int_t)fLoGainFirst
           << " to High Gain slice " << (Int_t)fLoGainLast << endl;
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -170 +170 @@
 
   *fLog << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
+  *fLog << inf << "Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
         << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
+  *fLog << inf << "Taking " << fNumLoGainSamples
         << " LoGain samples from slice " << (Int_t)fLoGainFirst
         << " to " << (Int_t)fLoGainLast << " incl" << endl;