Changeset 2775 for trunk

Timestamp:

01/13/04 08:55:53 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
  2004/01/12: Abelardo Moralejo
 
-  * mimage/MStereoPar.cc
-    - fixed mistake: now fSourceY = scale1*hillas1.GetMeanY() + ...
-      instead of         fSourceY = scale2*hillas1.GetMeanY() + ...
-      Bug had no effect unless scale1 != scale2 (-> telescopes of 
-      different size).
+   * mimage/MStereoPar.cc
+     - fixed mistake: now fSourceY = scale1*hillas1.GetMeanY() + ...
+       instead of         fSourceY = scale2*hillas1.GetMeanY() + ...
+       Bug had no effect unless scale1 != scale2 (-> telescopes of 
+       different size).
 
 
@@ -50 +50 @@
  2004/01/12: Markus Gaug
 
-  * manalysis/MExtractSignal.[h,cc]
-    - take out some uncommented code 
-    - replace logainshift by two independent variables: 
-      logainfirst, logainlast
-    - because in most data, maximum occurs in slice 4, shift default 
-      from slices 4-9 to slices 3-8.
-
-  * manalysis/MExtractedSignalPix.[h,cc]
-    - took out some uncommented code
-    - new initializers: instead of -1. now 99999.9
+   * manalysis/MExtractSignal.[h,cc]
+     - take out some uncommented code 
+     - replace logainshift by two independent variables: 
+       logainfirst, logainlast
+     - because in most data, maximum occurs in slice 4, shift default 
+       from slices 4-9 to slices 3-8.
+
+   * manalysis/MExtractedSignalPix.[h,cc]
+     - took out some uncommented code
+     - new initializers: instead of -1. now 99999.9
 
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -169 +169 @@
 // --------------------------------------------------------------------------
 //
+// Return the run type as string ("Data", "Pedestal", ...), for example
+// to print it as readable text.
+//
+const char *MRawRunHeader::GetRunTypeStr() const
+{
+    switch (fRunType)
+    {
+    case kRTData:
+        return "Data";
+    case kRTPedestal:
+        return "Pedestal";
+    case kRTCalibration:
+        return "Calibration";
+    case kRTMonteCarlo:
+        return "Monte Carlo";
+    default:
+        return "<unknown>";
+    }
+}
+
+// --------------------------------------------------------------------------
+//
 // print run header information on *fLog
 //
@@ -184 +206 @@
     *fLog << "Version:      " << dec << "Format=" << fFormatVersion << "  ";
     *fLog << "Software=" << fSoftVersion << endl;
-    *fLog << "RunNumber:    " << fRunNumber << " (Type=";
-    switch (fRunType)
-    {
-    case kRTData:
-        *fLog << "Data";
-        break;
-    case kRTPedestal:
-        *fLog << "Pedestal";
-        break;
-    case kRTCalibration:
-        *fLog << "Calibration";
-        break;
-    case kRTMonteCarlo:
-        *fLog << "Monte Carlo Data";
-        break;
-    default:
-        *fLog << "<unknown>";
-        break;
-    }
-    *fLog << ")" << endl;
+    *fLog << "RunNumber:    " << fRunNumber << " (Type=" << GetRunTypeStr() << ")" << endl;
     *fLog << "ProjectName: '" << fProjectName << "'" << endl;
     *fLog << "Source:      '" << fSourceName << "' " << "  ";

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -78 +78 @@
     UShort_t GetSoftVersion() const       { return fSoftVersion; }
     UShort_t GetRunType() const           { return fRunType; }
+    const char *GetRunTypeStr() const;
     UInt_t   GetRunNumber() const         { return fRunNumber; }
     const Char_t  *GetProjectName() const { return fProjectName; }