Changeset 6253

Timestamp:

02/04/05 13:31:19 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (2 diffs)
• mbase/MFilter.cc (modified) (1 diff)
• mbase/MParContainer.cc (modified) (4 diffs)
• merpp.cc (modified) (2 diffs)
• mfbase/MF.cc (modified) (2 diffs)
• mraw/MRawEvtData.cc (modified) (1 diff)
• mraw/MRawEvtPixelIter.cc (modified) (2 diffs)
• mraw/MRawEvtPixelIter.h (modified) (1 diff)
• showlog.cc (modified) (2 diffs)
• showplot.cc (modified) (2 diffs)
• star.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -129 +129 @@
    
    * mjobs/MJExtractCalibTest.[h,cc]
-     - remove
+     - removed
 
    * mjobs/MJCalibrateSignal.cc

trunk/MagicSoft/Mars/callisto.cc

@@ -379 +379 @@
             return 1;
         }
-        MJCalibTest job4(Form("MJCalibTest #%d", seq.GetSequence()));
+
         if (kUseTest)
-          {
-            job4.SetBadPixels(job3.GetBadPixels());            
+        {
+            MJCalibTest job4(Form("MJCalibTest #%d", seq.GetSequence()));
+            job4.SetBadPixels(job3.GetBadPixels());
             job4.SetSequence(seq);
             job4.SetEnv(kConfig);
@@ -390 +391 @@
             job4.SetPathOut(kOutpathC);
             job4.SetPathData(kInpathD);
-            //            job4.SetPathIn(kInpathC); 
 
             if (!job4.ProcessFile(job1.GetPedestalCam()))
-              {
+            {
                 gLog << err << "Calibration of calibration failed." << endl << endl;
                 return -1;
-              }
-            
+            }
+
             if (!job4.GetDisplay())
-              {
+            {
                 gLog << warn << "Display closed by user... execution aborted." << endl << endl;
                 return 1;
-              }
-          }
+            }
+        }
     }
 

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -95 +95 @@
 TString MFilter::GetRule() const
 {
-    return "<GetRule n/a for " + fName + ">";
+    return ClassName(); //"<GetRule n/a for " + fName + ">";
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -534 +534 @@
 MParContainer *MParContainer::GetNewObject(const char *name, TClass *base) const
 {
+    return base ? GetNewObject(name, base->GetName()) : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return a new object of class 'name'. Make sure that the object
+// derives from the class base.
+//
+// In case of failure return NULL
+//
+// The caller is responsible of deleting the object!
+//
+MParContainer *MParContainer::GetNewObject(const char *name, const char *base) const
+{
     TClass *cls = GetConstructor(name);
     if (!cls || !base)
@@ -540 +554 @@
     if (!cls->InheritsFrom(base))
     {
-        *fLog << " - Class doesn't inherit from " << base->GetName() << endl;
+        *fLog << err;
+        *fLog << dbginf << GetDescriptor() << " - Cannot create new instance of class '" << name << "': ";
+        *fLog << " - Class " << cls->GetName() << " doesn't inherit from " << base << endl;
         return NULL;
     }
@@ -550 +566 @@
     if (!obj)
     {
-        *fLog << " - Class has no default constructor." << endl;
-        *fLog << " - An abstract member functions of a base class is not overwritten." << endl;
-        return NULL;
-    }
-
-    return (MParContainer*)obj;
-}
-
-// --------------------------------------------------------------------------
-//
-// Return a new object of class 'name'. Make sure that the object
-// derives from the class base.
-//
-// In case of failure return NULL
-//
-// The caller is responsible of deleting the object!
-//
-MParContainer *MParContainer::GetNewObject(const char *name, const char *base) const
-{
-    TClass *cls = GetConstructor(name);
-    if (!cls || !base)
-        return NULL;
-
-    if (!cls->InheritsFrom(base))
-    {
-        *fLog << " - Class doesn't inherit from " << base << endl;
-        return NULL;
-    }
-
-    //
-    // create the parameter container of the the given class type
-    //
-    TObject *obj = (TObject*)cls->New();
-    if (!obj)
-    {
-        *fLog << " - Class has no default constructor." << endl;
+        *fLog << err;
+        *fLog << dbginf << GetDescriptor() << " - Cannot create new instance of class '" << name << "': ";
+        *fLog << " - Class " << cls->GetName() << " has no default constructor." << endl;
         *fLog << " - An abstract member functions of a base class is not overwritten." << endl;
         return NULL;
@@ -766 +749 @@
         return kFALSE;
 
-    *fLog << warn << "WARNING - Resource " << prefix+fName << " found, but no " << ClassName() << "::ReadEnv." << endl;
+    *fLog << warn << "WARNING - " << fName << ": Resource " << prefix << " found, but no " << ClassName() << "::ReadEnv." << endl;
     return kTRUE;
 }

trunk/MagicSoft/Mars/merpp.cc

@@ -73 +73 @@
     gLog << " Options:" << endl;
     gLog.Usage();
+    gLog << "   --version, -V             Show startup message with version number" << endl;
     gLog << "   -?, -h, --help            This help" << endl << endl;
     gLog << " File Options:" << endl;
@@ -150 +151 @@
     //
     MArgs arg(argc, argv);
+
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -172 +172 @@
     if (fg<0 && fl<0)
     {
-        *fLog << err << dbginf << "Syntax Error: No coditional sign found in " << txt << endl;
-        return NULL;
-    }
+        MFilter *f = (MFilter*)GetNewObject(txt, MFilter::Class());
+        if (!f)
+        {
+            *fLog << err << dbginf << "Syntax Error: '" << txt << "' is neither a MFilter nor conditional sign found." << endl;
+            return NULL;
+        }
+        // FIXME: Search object through list...?
+        txt = "";
+        return f;
+    }
+
     if (fg>=0 && fl>=0)
     {
@@ -199 +207 @@
 
     txt = "";
-
     return f;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -376 +376 @@
     fLoGainFadcSamples = new MArrayB(numconnected*numlo);
 
-    fABFlags           = new MArrayB(maxid/8+1);
+    fABFlags           = new MArrayB(maxid==0 ? 0 : maxid/8+1);
 
     fConnectedPixels   = 0;

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -73 +73 @@
 // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
 //
-#include <iostream>
 Bool_t MRawEvtPixelIter::HasLoGain() const
 {
@@ -85 +84 @@
         return kTRUE;
 
-//    cout << fNumLoGainEntry << " " << flush;
-//    cout << fData->fLoGainPixId->GetSize() << " " << flush;
-
     if (fNumLoGainEntry>fData->fLoGainPixId->GetSize())
         return kFALSE;
 
-/*
-    cout << fNumLoGainEntry << " " << flush;
-    cout << fData->fLoGainPixId->GetSize() << " " << flush;
-    cout << fData->fLoGainPixId->GetArray() << " " << flush;
-    cout << fLoGainId << endl;
-    */
-//    cout << (int)(fLoGainId-fData->fLoGainPixId->GetArray()) << " " << flush;
-//    cout << (int)(fHiGainId-fData->fHiGainPixId->GetArray()) << " " << flush;
-
     Bool_t rc = *fHiGainId!=*fLoGainId;
-
-//    cout << "done." << endl;
-
 
     if (rc)
         return kFALSE;
-    /*
-    // We have no lo-gain at all
-    if (!fLoGainId)
-        return kFALSE;
-
-    // This is to make the first call of this function in Next()
-    // work properly! NEVER call this function before Next()
-    if (fNumLoGainEntry==0)
-        return kTRUE;
-
-    // Make sure, that we don't exceed the last entry in the array!
-    if (fNumLoGainEntry==fData->fLoGainPixId->GetSize())
-        return kFALSE;
-
-    // Check whether the current position in lo-gain fits the hi-gain
-    return *fHiGainId!=*fLoGainId;
-     */
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -97 +97 @@
         // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
         //
-        return fABFlags ? TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8) : 0;
+        return TESTBIT(GetABFlag(), GetPixelId()%8);
     }
     Byte_t GetABFlag() const

trunk/MagicSoft/Mars/showlog.cc

@@ -19 +19 @@
     gLog << "   showlog [options] < filename" << endl << endl;
     gLog.Usage();
-    gLog << "   -?, -h, --help            This help" << endl << endl;
+    gLog << "   --version, -V             Show startup message with version number" << endl;
+    gLog << "   -?, -h, --help            This help" << endl;
     gLog << endl;
     gLog << " This program converts colored output  made with ansi codes" << endl;
@@ -49 +50 @@
 {
     MArgs arg(argc, argv);
+
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))

trunk/MagicSoft/Mars/showplot.cc

@@ -41 +41 @@
     gLog << "   --save-as-gif[=filename]  Save plots as gif files" << endl;
     gLog << "   --save-as-C[=filename]    Save plots as root scripts" << endl;
-    gLog << "   --tab=num                 Save only tab number num" << endl << endl;
+    gLog << "   --tab=num                 Save only tab number num" << endl;
+    gLog << endl;
+    gLog << "   --version, -V             Show startup message with version number" << endl;
+    gLog << "   -?, -h, --help            This help" << endl;
+    gLog << endl;
     gLog << "Description:" << endl;
     gLog << " Use showplot to display a MStatusArray in an MStatusDisplay." << endl;
@@ -57 +61 @@
     //
     MArgs arg(argc, argv, kTRUE);
+
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))

trunk/MagicSoft/Mars/star.cc

@@ -66 +66 @@
     gLog << "   --config=star.rc          Resource file [default=star.rc]" << endl;
     gLog << endl;
+    gLog << "   --version, -V             Show startup message with version number" << endl;
     gLog << "   -?, -h, --help            This help" << endl << endl;
 }
@@ -77 +78 @@
     //
     MArgs arg(argc, argv, kTRUE);
+
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))