Changeset 7109

Timestamp:

05/30/05 18:12:10 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsCalc.cc (modified) (2 diffs)
• mbadpixels/MBadPixelsCalc.h (modified) (3 diffs)
• mhflux/FluxLinkDef.h (modified) (2 diffs)
• mhflux/MHDisp.cc (added)
• mhflux/MHFalseSource.cc (modified) (4 diffs)
• mhflux/MHFalseSource.h (modified) (4 diffs)
• mjobs/MJCut.cc (modified) (8 diffs)
• mjobs/MJCut.h (modified) (4 diffs)
• mpedestal/MPedPhotCam.cc (modified) (3 diffs)
• mpedestal/MPedPhotCam.h (modified) (3 diffs)
• mpointing/MSrcPosCam.cc (modified) (1 diff)
• mpointing/MSrcPosCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -136 +136 @@
 Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const
 {
+    if (!fGeomCam || !fPedPhotCam || !fBadPixels)
+    {
+        *fLog << err << "MBadPixelsCalc::CheckPedestalRms: ERROR - One of the necessary container are not initialized..." << endl;
+        return kFALSE;
+    }
+
     if (fPedestalLevel<=0 && fPedestalLevelVariance<=0)
         return kTRUE;
@@ -247 +253 @@
     // Check if the number of pixels to blind is > 60% of total number of pixels
     //
-    //    if (bads>0.6*entries)
-    //    {
-    //    fErrors[2]++;
-    //    return kFALSE;
-    //    }
+    if (bads>0.5*entries)
+    {
+        *fLog << err << "ERROR - More than 50% unsuitable pixels... something must be wrong!" << endl;
+        return kFALSE;
+    }
 
     return kTRUE;
+}
+
+Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsCam &cam, const MPedPhotCam &ped, MBadPixelsPix::UnsuitableType_t t)
+{
+    MBadPixelsCam *store1 = fBadPixels;
+    const MPedPhotCam *store2 = fPedPhotCam;
+
+    fBadPixels  = &cam;
+    fPedPhotCam = &ped;
+
+    const Bool_t rc = CheckPedestalRms(t);
+
+    fBadPixels  = store1;
+    fPedPhotCam = store2;
+
+    return rc;
+}
+
+Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsCam &cam, const MPedestalCam &ped, MBadPixelsPix::UnsuitableType_t t)
+{
+    return CheckPedestalRms(cam, MPedPhotCam(ped), t);
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h

@@ -12 +12 @@
 class MGeomCam;
 class MPedPhotCam;
+class MPedestalCam;
 
 class MBadPixelsCalc : public MTask
 {
 private:
-    MGeomCam      *fGeomCam;    //! Input container storing the pixel sizes
-    MPedPhotCam   *fPedPhotCam; //! Input container storing the pedestal and pedestal rms of all pixels
-    MBadPixelsCam *fBadPixels;  //! Output container holding the bad pixels
+    const MGeomCam      *fGeomCam;    //! Input container storing the pixel sizes
+    const MPedPhotCam   *fPedPhotCam; //! Input container storing the pedestal and pedestal rms of all pixels
+          MBadPixelsCam *fBadPixels;  //! Output container holding the bad pixels
 
     Float_t fPedestalLevel;
@@ -27 +28 @@
     Bool_t fCheckInProcess;
     Bool_t fCheckInPostProcess;
-
-    // MBadPixelsCalc
-    Bool_t CheckPedestalRms(MBadPixelsPix::UnsuitableType_t t) const;
 
     // MTask
@@ -47 +45 @@
     void SetNamePedPhotCam(const char *name) { fNamePedPhotCam = name; }
 
+    void SetGeomCam(const MGeomCam *geom) { fGeomCam = geom; }
+
     void EnableCheckInProcess(Bool_t b=kTRUE)     { fCheckInProcess = b; }
     void EnableCheckInPostProcess(Bool_t b=kTRUE) { fCheckInPostProcess = b; }
+
+    // MBadPixelsCalc
+    Bool_t CheckPedestalRms(MBadPixelsPix::UnsuitableType_t t) const;
+    Bool_t CheckPedestalRms(MBadPixelsCam &cam, const MPedPhotCam  &ped, MBadPixelsPix::UnsuitableType_t t=MBadPixelsPix::kUnsuitableRun);
+    Bool_t CheckPedestalRms(MBadPixelsCam &cam, const MPedestalCam &ped, MBadPixelsPix::UnsuitableType_t t=MBadPixelsPix::kUnsuitableRun);
 
     ClassDef(MBadPixelsCalc, 1) // Task to find bad pixels (star, broken pixels, etc)

trunk/MagicSoft/Mars/mhflux/FluxLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MAlphaFitter+;
 
+#pragma link C++ class MHDisp+;
 #pragma link C++ class MHAlpha+;
 #pragma link C++ class MHThetaSq+;
@@ -13 +14 @@
 #pragma link C++ class MHEffectiveOnTime+;
 #pragma link C++ class MHCollectionArea+;
+#pragma link C++ class MMcSpectrumWeight+;
+
+//#pragma link C++ class MMatrixHist+;
+//#pragma link C++ class MMatrixUnfold+;
+//#pragma link C++ class MUnfoldBert+;
 
 #endif

trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

@@ -246 +246 @@
     fMm2Deg = geom->GetConvMm2Deg();
 
-    if (fName!=(TString)"MHFalseSourceOff" && fHistOff==NULL)
-    {
-        MHFalseSource *hoff = (MHFalseSource*)plist->FindObject("MHFalseSourceOff", "MHFalseSource");
+    const TString off(Form("%sOff", fName.Data()));
+    if (fName!=off && fHistOff==NULL)
+    {
+        const TString desc(Form("%s [%s] found... using ", off.Data(), ClassName()));
+        MHFalseSource *hoff = (MHFalseSource*)plist->FindObject(off, ClassName());
         if (!hoff)
-            *fLog << inf << "No MHFalseSourceOff [MHFalseSource] found... using current data only!" << endl;
+            *fLog << inf << "No " << desc << "current data only!" << endl;
         else
         {
-            *fLog << inf << "MHFalseSource [MHFalseSource] found... using on-off mode!" << endl;
+            *fLog << inf << desc << "on-off mode!" << endl;
             SetOffData(*hoff);
         }
@@ -294 +296 @@
         *fLog << warn << "MObservatory not found... no derotation." << endl;
 
+    MPointingPos *point = (MPointingPos*)plist->FindObject("MSourcePos", "MPointingPos");
+    if (!point)
+        point = fPointPos;
+
     // FIXME: Because the pointing position could change we must check
     // for the current pointing position and add a offset in the
     // Fill function!
-    fRa  = fPointPos ? fPointPos->GetRa()  :  0;
-    fDec = fPointPos ? fPointPos->GetDec() : 90;
+    fRa  = point ? point->GetRa()  :  0;
+    fDec = point ? point->GetDec() : 90;
 
     return kTRUE;
@@ -615 +621 @@
                 const Int_t l = h0->GetXaxis()->FindFixBin(fAlphaCut*3)+f-1;
                 h0->Scale(h1->Integral(f, l)/h0->Integral(f, l));
+
+
                 //h0->Scale(h1->GetEntries()/h0->GetEntries());
 
@@ -854 +862 @@
 }
 
-Double_t FcnGauss2d(Double_t *x, Double_t *par)
+static Double_t FcnGauss2d(Double_t *x, Double_t *par)
 {
     TVector2 v = TVector2(x[0], x[1]).Rotate(par[5]*TMath::DegToRad());

trunk/MagicSoft/Mars/mhflux/MHFalseSource.h

@@ -20 +20 @@
 class MHFalseSource : public MH
 {
-private:
+protected:
     MTime         *fTime;        //! container to take the event time from
     MPointingPos  *fPointPos;    //! container to take pointing position from
@@ -28 +28 @@
     Float_t fMm2Deg;             // conversion factor for display in degrees
 
+private:
     Float_t fAlphaCut;           // Alpha cut
     Float_t fBgMean;             // Background mean
@@ -37 +38 @@
     Float_t fMaxDW;              // Maximum distance in percent of dist
 
+protected:
     TH3D    fHist;               // Alpha vs. x and y
 
@@ -44 +46 @@
     Double_t fDec;
 
+private:
     Int_t DistancetoPrimitive(Int_t px, Int_t py);
     void Modified();

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -304 +304 @@
 
     SetNameHist(GetEnv("NameHist", fNameHist));
+    SetNameHistFS(GetEnv("NameHistFS", fNameHistFS));
 
     return kTRUE;
@@ -366 +367 @@
     }
 
-    const TString objname(Form("%s%s", "Hist"/*fNameHist.Data()*/, name));
+    const TString objname(Form("Hist%s", name));
     MHAlpha *h = (MHAlpha*)plist.FindCreateObj(fNameHist, objname);
     if (!h)
@@ -374 +375 @@
 
     return h;
+}
+
+// --------------------------------------------------------------------------
+//
+// Create a new instance of an object with name name of class
+// type fNameHistFS in parlist. It must derive from MHFalseSource
+// If something fails NULL is returned.
+//
+MH *MJCut::CreateNewHistFS(MParList &plist, const char *name) const
+{
+    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS);
+
+    TClass *cls = gROOT->GetClass(cname);
+    if (!cls)
+    {
+        *fLog << err << "Class " << cname << " not found in dictionary... abort." << endl;
+        return NULL;
+    }
+    if (!cls->InheritsFrom("MHFalseSource"))
+    {
+        *fLog << err << "Class " << cname << " doesn't inherit from MHFalseSource... abort." << endl;
+        return NULL;
+    }
+
+    const TString objname(Form("FS%s", name));
+    return (MH*)plist.FindCreateObj(cname, objname);
 }
 
@@ -452 +479 @@
     MHAlpha *halphaoff = CreateNewHist(plist, "Off");
     MFillH falpha(halphaoff, "", "FillHist");
-    MFillH ffs("MHFalseSourceOff [MHFalseSource]", "MHillas", "FillFS");
+    MH *hfsoff = CreateNewHistFS(plist, "Off");
+    MFillH ffs(hfsoff, "MHillas", "FillFS");
 
     // FIXME: If fPathIn read cuts and energy estimator from file!
@@ -531 +559 @@
     tlist2.AddToList(&scalc);
     tlist2.AddToList(&hcalc);
-    if (fIsWobble)
+    //if (fIsWobble)
         tlist2.AddToList(&hcalc2);
     //tlist2.AddToList(&taskenv1);
@@ -541 +569 @@
         tlist2.AddToList(&fill1a);
     tlist2.AddToList(&cont1);
-    if (!fWriteOnly && !fIsWobble)
+    if (!fWriteOnly && (!fIsWobble || !fNameHistFS.IsNull()))
         tlist2.AddToList(&ffs);
     tlist2.AddToList(&cont2);
@@ -679 +707 @@
     MHAlpha *halphaon=CreateNewHist(plist);
     MFillH falpha2(halphaon, "", "FillHist");
-    MFillH ffs2("MHFalseSource", "MHillas", "FillFS");
+    MH *hfs=CreateNewHistFS(plist);
+    MFillH ffs2(hfs, "MHillas", "FillFS");
 
     tlist.Replace(&readon);
@@ -702 +731 @@
         }
         tlist2.Replace(&falpha2);
-        if (!fIsWobble)
+        if (!fIsWobble/* || !fNameHist.IsNull()*/)
             tlist2.Replace(&ffs2);
+        if (fIsWobble && !fNameHist.IsNull())
+            tlist2.RemoveFromList(&ffs);
 
         if (!fIsMonteCarlo)

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -10 +10 @@
 class MParList;
 class MHAlpha;
+class MH;
 class MWriteRootFile;
 
@@ -28 +29 @@
 
     TString fNameHist;
+    TString fNameHistFS;
 
     //MTask *fEstimateEnergy;
@@ -38 +40 @@
     Bool_t   WriteResult(const MParList &plist, UInt_t num) const;
     MHAlpha *CreateNewHist(MParList &plist, const char *name="") const;
+    MH      *CreateNewHistFS(MParList &plist, const char *name="") const;
 
     Bool_t   CanStoreSummary() const { return !fPathOut.IsNull() && fStoreSummary; }
@@ -61 +64 @@
 
     void SetNameHist(const char *name) { fNameHist=name; }
+    void SetNameHistFS(const char *name) { fNameHistFS=name; }
 
     //void SetEnergyEstimator(const MTask *task=0);

trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc

@@ -55 +55 @@
 #include "MBadPixelsPix.h"
 
+#include "MPedestalCam.h"
+#include "MPedestalPix.h"
+
 ClassImp(MPedPhotCam);
 
@@ -61 +64 @@
 // --------------------------------------------------------------------------
 //
-// Default constructor. Creates a MPedPhotPix object for each pixel
-//
-MPedPhotCam::MPedPhotCam(const char *name, const char *title)
+// Contains the default constructor. Creates a MPedPhotPix object
+// for each pixel
+//
+void MPedPhotCam::InitArrays(const char *name, const char *title)
 {
     fName  = name  ? name  : "MPedPhotCam";
@@ -71 +75 @@
     fAreas   = new TClonesArray("MPedPhotPix", 1);
     fSectors = new TClonesArray("MPedPhotPix", 1);
+}
+
+// --------------------------------------------------------------------------
+//
+// Default constructor. Creates a MPedPhotPix object for each pixel
+//
+MPedPhotCam::MPedPhotCam(const char *name, const char *title)
+{
+    InitArrays(name, title);
+}
+
+// --------------------------------------------------------------------------
+//
+// Initialize the mean, rms and number of events with the values from
+// the MPedestalCam converted 1:1
+//
+MPedPhotCam::MPedPhotCam(const MPedestalCam &p)
+{
+    const Int_t n = p.GetSize();
+
+    InitArrays();
+    InitSize(n);
+
+    for (int i=0; i<n; i++)
+        (*this)[i].Set(p[i].GetPedestal(), p[i].GetPedestalRms(), p[i].GetNumEvents());
 }
 

trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.h

@@ -14 +14 @@
 class MPedPhotPix;
 class MBadPixelsCam;
+class MPedestalCam;
 
 class MPedPhotCam : public MParContainer, public MCamEvent
@@ -22 +23 @@
     TClonesArray *fSectors;  //-> Array of MPedPhotPix, one per camera sector
 
+    void InitArrays(const char *name=NULL, const char *title=NULL);
+
     //  void InitSize(const UInt_t i);
     void InitAreas(const UInt_t i);
@@ -28 +31 @@
 public:
     MPedPhotCam(const char *name=NULL, const char *title=NULL);
+    MPedPhotCam(const MPedestalCam &pcam);
     ~MPedPhotCam();
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCam.cc

@@ -56 +56 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+}
+
+// --------------------------------------------------------------------------
+//
+// Copy constructor, set default name and title
+//
+MSrcPosCam::MSrcPosCam(const MSrcPosCam &p) : fX(p.fX), fY(p,fY)
+{
+    fName  = gsDefName.Data();
+    fTitle = gsDefTitle.Data();
 }
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCam.h

@@ -16 +16 @@
 public:
     MSrcPosCam(const char *name=NULL, const char *title=NULL);
+    MSrcPosCam(const MSrcPosCam &p);
 
     void Clear(Option_t *)           { fX = 0; fY = 0; }