Changeset 7517 for trunk/MagicSoft

Timestamp:

02/17/06 10:15:31 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (3 diffs)
• mpointing/MPointingPos.cc (modified) (3 diffs)
• mpointing/MPointingPos.h (modified) (2 diffs)
• showplot.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/17 Thomas Bretz
+
+   * showplot.cc:
+     - fixed path inflation in case of ganymed
+
+   * mjobs/MDataSet.cc:
+     - return kFALSE if requested source wasn't found in catalog
+
+   * mjobs/MJCut.cc:
+     - reformatted output of source to fit in one line
+
+   * mpointing/MPointingPos.[h,cc]:
+     - output source name (title) in Print() if set
+
+
+
  2006/02/16 Daniela Dorner
 

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
  *** Version  <cvs>
 
+   - showplot: path inflation for ganymed files was broken
+
+   - ganymed: now stops in requested source isn't found in catalog file
 
 

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -421 +421 @@
         line.ReadLine(fin);
         if (!fin)
-            break;
+        {
+            gLog << err << "ERROR - Source '" << fNameSource << "' not found in " << catalog << "." << endl;
+            return kFALSE;
+        }
 
         n++;

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -338 +338 @@
 //   "MHillas"      to  "Events"
 //   "MHillasSrc"   to  "Events"
-//   "MHadronness"  to  "Events"       yes
+//   "Hadronness"   to  "Events"       yes
 //   "MEnergyEst"   to  "Events"       yes
 //   "DataType"     to  "Events"
@@ -365 +365 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
+    //    write->AddContainer("MMuonSearchPar", "Events", kFALSE);
+    //    write->AddContainer("MMuonCalibPar",  "Events", kFALSE);
 }
 
@@ -465 +467 @@
             return kFALSE;
         plist.AddToList(&source);
-        *fLog << all << "Using Source Position: ";
+        *fLog << all;
         source.Print("RaDec");
     }

trunk/MagicSoft/Mars/mpointing/MPointingPos.cc

@@ -54 +54 @@
 using namespace std;
 
+const TString MPointingPos::gsDefName  = "MPointingPos";
+const TString MPointingPos::gsDefTitle = "Container storing the (corrected) telescope pointing position";
+
 // --------------------------------------------------------------------------
 //
@@ -89 +92 @@
         opt = "radeczdaz";
 
-    *fLog << GetDescriptor() << ": ";
+    *fLog << GetDescriptor() << ":";
 
     if (opt.Contains("ra", TString::kIgnoreCase))
@@ -101 +104 @@
     if (opt.Contains("az", TString::kIgnoreCase))
         *fLog << " Az=" << MAstro::GetStringDeg(fAz);
+
+    if (fTitle!=gsDefTitle)
+        *fLog << " <" << fTitle << ">";
+
     *fLog << endl;
 }

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -18 +18 @@
 {
 private:
+    static const TString gsDefName;
+    static const TString gsDefTitle;
+
     Double_t fZd;  // [deg] Zenith distance (ZA)
     Double_t fAz;  // [deg] Azimuth
@@ -28 +31 @@
     MPointingPos(const char *name=0, const char *title=0) : fZd(0), fAz(0), fRa(0), fHa(0), fDec(0)
     {
-        fName  = name ? name   : "MPointingPos";
-        fTitle = title ? title : "Container storing the (corrected) telescope pointing position";
+        fName  = name  ? (TString)name  : gsDefName;
+        fTitle = title ? (TString)title : gsDefTitle;
     }
     MPointingPos(const MPointingPos &p) : MParContainer(p),

trunk/MagicSoft/Mars/showplot.cc

@@ -159 +159 @@
     //
     TString kInput = arg.GetArgumentStr(0);
+    kInput.ToLower();
 
     //
@@ -177 +178 @@
             break;
         }
-        file += Form("/%04d/%08d/", num/10000, num);
+        file += kInput==(TString)"ganymed" ? Form("/%05d", num/100000) : Form("/%04d", num/10000);
+        file += Form("/%08d/", num);
         file += kInput;
         file += Form("%08d.root", num);