Changeset 3526

Timestamp:

03/16/04 18:50:24 (21 years ago)

Author:

blanch

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• ImageLinkDef.h (modified) (1 diff)
• MConcentration.cc (added)
• MConcentration.h (added)
• MHillasCalc.cc (modified) (4 diffs)
• MHillasCalc.h (modified) (4 diffs)
• MNewImagePar.cc (modified) (3 diffs)
• MNewImagePar.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/ImageLinkDef.h

@@ -16 +16 @@
 
 #pragma link C++ class MNewImagePar+;
+#pragma link C++ class MConcentration+;
 
 #pragma link C++ class MHHillas+;

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -65 +65 @@
 #include "MHillasExt.h"
 #include "MNewImagePar.h"
-
+#include "MConcentration.h"
 #include "MCerPhotEvt.h"
 
@@ -81 +81 @@
 MHillasCalc::MHillasCalc(const char *name, const char *title)
     : fHilName("MHillas"), fHilExtName("MHillasExt"),
-    fImgParName("MNewImagePar"), fFlags(0xff), fErrors(5)
+    fImgParName("MNewImagePar"), fConcName("MConcentration"),
+    fFlags(0xff), fErrors(5)
 {
     fName  = name  ? name  : "MHillasCalc";
@@ -139 +140 @@
     }
 
-    memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
+     // if enabled
+    if (TestFlag(kCalcConc))
+    {
+        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fConcName);
+        if (!fConc)
+            return kFALSE;
+    }
+
+   memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
 
     return kTRUE;
@@ -171 +180 @@
     if (TestFlag(kCalcNewImagePar))
         fNewImgPar->Calc(*fGeomCam, *fCerPhotEvt, *fHillas);
+
+    if (TestFlag(kCalcConc))
+        fConc->Calc(*fGeomCam, *fCerPhotEvt, *fHillas);
 
     return kTRUE;

trunk/MagicSoft/Mars/mimage/MHillasCalc.h

@@ -22 +22 @@
 class MHillasExt;
 class MNewImagePar;
+class MConcentration;
 
 class MHillasCalc : public MTask
@@ -31 +32 @@
     MHillasExt   *fHillasExt;       //! output container to store result
     MNewImagePar *fNewImgPar;       //! output container to store result
+    MConcentration *fConc;          //! output container to store result
 
     TString      fHilName;          // name of the 'MHillas' container
     TString      fHilExtName;       // name of the 'MHillasExt' container
     TString      fImgParName;       // name of the 'MNewImagePar' container
+    TString      fConcName;         // name of the 'MConcentration' container
 
     Int_t        fFlags;            // Flags defining the behaviour of MHillasCalc
@@ -51 +54 @@
         kCalcHillasExt   = BIT(1),
         //kCalcHillasSrc   = BIT(2),
-        kCalcNewImagePar = BIT(3)
+        kCalcNewImagePar = BIT(3),
+        kCalcConc        = BIT(4)
     };
 
@@ -59 +63 @@
     void SetNameHillasExt(const char *name) { fHilExtName = name; }
     void SetNameNewImgPar(const char *name) { fImgParName = name; }
+    void SetNameConc(const char *name) { fConcName = name; }
 
     void SetFlags(Int_t f) { fFlags  =  f; }

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -116 +116 @@
     Double_t edgepixin2 = 0;
 
-    Float_t maxpix[9] = {0,0,0,0,0,0,0,0,0};             // [#phot]
     Float_t maxpix1 = 0;                                 // [#phot]
     Float_t maxpix2 = 0;                                 // [#phot]
@@ -171 +170 @@
           }
         }
-
-        // Compute Concentrations 1-8   
-
-        if(maxpix[0]<=nphot) {
-          for(int i=0;i<8;i++)
-            maxpix[8-i]=maxpix[7-i];
-          maxpix[0]=nphot;
-        }
-        else 
-          for(int i=0;i<8;i++){
-            if (nphot<maxpix[7-i]){
-              for(int j=0;j<i-1;j++){  
-                maxpix[7-j]=maxpix[6-j];                    // [1]
-              }
-              maxpix[8-i]=nphot;
-              break;
-            }
-          }
 
         // Compute Concetration 1 -2 
@@ -211 +192 @@
     fConc1 = maxpix1/hillas.GetSize();                   // [ratio]
 
-    fConc3 = (maxpix[0]+maxpix[1]+maxpix[2]);
-    fConc4 = (fConc3+maxpix[3]);
-    fConc5 = (fConc4+maxpix[4]);
-    fConc6 = (fConc5+maxpix[5]);
-    fConc7 = (fConc6+maxpix[6]);
-    fConc8 = (fConc7+maxpix[7]);
-
-    fConc3/=hillas.GetSize();                           // [ratio]
-    fConc4/=hillas.GetSize();                           // [ratio]
-    fConc5/=hillas.GetSize();                           // [ratio]
-    fConc6/=hillas.GetSize();                           // [ratio]
-    fConc7/=hillas.GetSize();                           // [ratio]
-    fConc8/=hillas.GetSize();                           // [ratio]
-
     SetReadyToSave();
 } 

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -21 +21 @@
     Float_t fConc;               // [ratio] concentration ratio: sum of the two highest pixels / fSize
     Float_t fConc1;              // [ratio] concentration ratio: sum of the highest pixel / fSize
-    Float_t fConc3;              // [ratio] concentration ratio: sum of the 3 highest pixel / fSize
-    Float_t fConc4;              // [ratio] concentration ratio: sum of the 4 highest pixel / fSize
-    Float_t fConc5;              // [ratio] concentration ratio: sum of the 5 highest pixel / fSize
-    Float_t fConc6;              // [ratio] concentration ratio: sum of the 6 highest pixel / fSize
-    Float_t fConc7;              // [ratio] concentration ratio: sum of the 7 highest pixel / fSize
-    Float_t fConc8;              // [ratio] concentration ratio: sum of the 8 highest pixel / fSize
 
     Short_t fNumUsedPixels;      // Number of pixels which survived the image cleaning

trunk/MagicSoft/Mars/mimage/Makefile

@@ -37 +37 @@
            MHillasSrcCalc.cc \
            MNewImagePar.cc \
+           MConcentration.cc \
            MHHillas.cc \
            MHHillasSrc.cc \