Changeset 4702 for trunk/MagicSoft/Mars/mimage

Timestamp:

08/23/04 11:41:30 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MImgCleanStd.cc (modified) (9 diffs)
• MImgCleanStd.h (modified) (4 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -250 +250 @@
 #include <fstream>        // ofstream, SavePrimitive
 
+#include <TEnv.h>
+
 #include <TGFrame.h>      // TGFrame
 #include <TGLabel.h>      // TGLabel
@@ -279 +281 @@
 static const TString gsDefName  = "MImgCleanStd";
 static const TString gsDefTitle = "Task to perform image cleaning";
+
+const TString MImgCleanStd::gsNamePedPhotCam="MPedPhotCam"; // default name of the 'MPedPhotCam' container
 
 // --------------------------------------------------------------------------
@@ -291 +295 @@
                            const char *name, const char *title)
     : fCleaningMethod(kStandard), fCleanLvl1(lvl1),
-      fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotContainer("MPedPhotCam")
+      fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotCam(gsNamePedPhotCam)
 
 {
@@ -499 +503 @@
     if (!fCam)
     {
-        *fLog << dbginf << "MGeomCam not found (no geometry information available)... aborting." << endl;
+        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
         return kFALSE;
     }
@@ -506 +510 @@
     if (!fEvt)
     {
-        *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl;
+        *fLog << err << "MCerPhotEvt not found... aborting." << endl;
         return kFALSE;
     }
 
-    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
+    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotCam), "MPedPhotCam");
     if (!fPed)
     {
-        *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
+        *fLog << err << "MPedPhotCam not found... aborting." << endl;
         return kFALSE;
     }
+
+    fTime = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
+    if (!fTime && fCleaningMethod==kProbability)
+        *fLog << warn << "MArrivalTime not found... probability cleaning done with signal only!" << endl;
 
     fData = (MCameraData*)pList->FindCreateObj(AddSerialNumber("MCameraData"));
@@ -541 +549 @@
         fData->CalcCleaningLevelDemocratic(*fEvt, *fPed, *fCam);
         break;
+        /*
+    case kProbability:
+        fData->CalcCleaningProbability(*fEvt, *fPed, *fCam, fTime);
+        break;*/
+    default:
+        break;
     }
 
@@ -556 +570 @@
     // For speed reasons skip the rest of the cleaning if no
     // action will be taken!
-    if (fCleanLvl1<=fCleanLvl2)
-        return kTRUE;
-
+    if (fCleanLvl1>fCleanLvl2)
+    {
 #ifdef DEBUG
-    *fLog << all << "CleanStep 3" << endl;
+        *fLog << all << "CleanStep 3" << endl;
 #endif
-    CleanStep3();
+        CleanStep3();
+    }
+
+#ifdef DEBUG
+        *fLog << all << "Calc Islands" << endl;
+#endif
+    // Takes roughly 10% of the time
+    fEvt->CalcIslands(*fCam);
+
 #ifdef DEBUG
     *fLog << all << "Done." << endl;
@@ -587 +608 @@
     case kScaled:
         *fLog << "scaled";
+        break;
+    case kProbability:
+        *fLog << "probability";
         break;
     }
@@ -711 +735 @@
     out << ");" << endl;
 
-    if (fCleaningMethod!=kDemocratic)
-        return;
-
-    out << "   " << GetUniqueName() << ".SetMethod(MImgCleanStd::kDemocratic);" << endl;
-
-    if (fCleanRings==1)
-        return;
-
-    out << "   " << GetUniqueName() << ".SetCleanRings(" << fCleanRings << ");" << endl;
-}
+    if (fCleaningMethod!=kStandard)
+    {
+        out << "   " << GetUniqueName() << ".SetMethod(MImgCleanStd::k";
+        switch (fCleaningMethod)
+        {
+        case kScaled:      out << "Scaled";      break;
+        case kDemocratic:  out << "Democratic";  break;
+        case kProbability: out << "Probability"; break;
+        default:
+            break;
+        }
+        out << ");" << endl;
+    }
+    if (fCleanRings!=1)
+        out << "   " << GetUniqueName() << ".SetCleanRings(" << fCleanRings << ");" << endl;
+
+    if (gsNamePedPhotCam!=fNamePedPhotCam)
+        out << "   " << GetUniqueName() << ".SetNamePedPhotCam(\"" << fNamePedPhotCam << "\");" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv, eg:
+//   MImgCleanStd.CleanLevel1: 3.0
+//   MImgCleanStd.CleanLevel2: 2.5
+//   MImgCleanStd.CleanMethod: Standard, Scaled, Democratic, Probability
+//   MImgCleanStd.CleanRings:  1
+//
+Int_t MImgCleanStd::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "CleanRings", print))
+    {
+        rc = kTRUE;
+        SetCleanRings(GetEnvValue(env, prefix, "CleanRings", fCleanRings));
+    }
+    if (IsEnvDefined(env, prefix, "CleanLevel1", print))
+    {
+        rc = kTRUE;
+        fCleanLvl1 = GetEnvValue(env, prefix, "CleanLevel1", fCleanLvl1);
+    }
+    if (IsEnvDefined(env, prefix, "CleanLevel2", print))
+    {
+        rc = kTRUE;
+        fCleanLvl2 = GetEnvValue(env, prefix, "CleanLevel2", fCleanLvl2);
+    }
+
+    if (IsEnvDefined(env, prefix, "CleanMethod", print))
+    {
+        rc = kTRUE;
+        TString s = GetEnvValue(env, prefix, "CleanMethod", "");
+        s.ToLower();
+        if (s.BeginsWith("standard"))
+            SetMethod(kStandard);
+        if (s.BeginsWith("scaled"))
+            SetMethod(kScaled);
+        if (s.BeginsWith("democratic"))
+            SetMethod(kDemocratic);
+        if (s.BeginsWith("probability"))
+            SetMethod(kProbability);
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -11 +11 @@
 class MCerPhotEvt;
 class MPedPhotCam;
+class MArrivalTime;
 class MCameraData;
 
@@ -21 +22 @@
         kStandard,
         kScaled,
-        kDemocratic
+        kDemocratic,
+        kProbability
     } CleaningMethod_t;
 
 private:
-    const MGeomCam    *fCam;  //!
-          MCerPhotEvt *fEvt;  //!
-          MPedPhotCam *fPed;  //!
-          MCameraData *fData; //!
+    static const TString gsNamePedPhotCam; // default name of the 'MPedPhotCam' container
+
+    const MGeomCam     *fCam;  //!
+          MCerPhotEvt  *fEvt;  //!
+          MPedPhotCam  *fPed;  //!
+          MArrivalTime *fTime; //!
+          MCameraData  *fData; //!
 
     CleaningMethod_t fCleaningMethod;
 
-    Float_t fCleanLvl1;
-    Float_t fCleanLvl2;
+    Float_t  fCleanLvl1;
+    Float_t  fCleanLvl2;
 
     UShort_t fCleanRings;
 
-    Float_t fInnerNoise;      //!
-    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
+    TString  fNamePedPhotCam; // name of the 'MPedPhotCam' container
 
 
-    void CreateGuiElements(MGGroupFrame *f);
-    void StreamPrimitive(ofstream &out) const;
+    void  CreateGuiElements(MGGroupFrame *f);
+    void  StreamPrimitive(ofstream &out) const;
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-    void   CleanStep3b(MCerPhotPix &pix);
-    void   CleanStep4(UShort_t r, MCerPhotPix &pix);
+    void  CleanStep3b(MCerPhotPix &pix);
+    void  CleanStep4(UShort_t r, MCerPhotPix &pix);
 
     void  CleanStep1();
@@ -56 +61 @@
 public:
     MImgCleanStd(const Float_t lvl1=3.0, const Float_t lvl2=2.5,
-              const char *name=NULL, const char *title=NULL);
+                 const char *name=NULL, const char *title=NULL);
     void Print(Option_t *o="") const;
 
@@ -67 +72 @@
 
     Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
-    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
+    void SetNamePedPhotCam(const char *name)  { fNamePedPhotCam = name; }
 
     ClassDef(MImgCleanStd, 2)    // task doing the image cleaning

trunk/MagicSoft/Mars/mimage/Makefile

@@ -20 +20 @@
 #
 INCLUDES = -I. -I../mbase -I../mhbase -I../mgeom -I../manalysis \
-           -I../mgui -I../mmc -I../mpointing -I../mpedestal
+           -I../mgui -I../mmc -I../mpointing -I../mpedestal \
+           -I../mhist
+
+# mhist: MHHillas (MHCamera)
+
 
 SRCFILES = MImgCleanStd.cc \