Changeset 5429 for trunk

Timestamp:

11/18/04 15:35:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfbase/MFEventSelector2.cc (modified) (6 diffs)
• mfbase/MFEventSelector2.h (modified) (3 diffs)
• mgeom/MGeomCam.cc (modified) (2 diffs)
• mgeom/MGeomCam.h (modified) (2 diffs)
• mgeom/MGeomPix.h (modified) (1 diff)
• mhbase/MH3.cc (modified) (1 diff)
• mhbase/MH3.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - fixed a bug in the handling of kUsePed which caused the MTaskEnv
        to be set incorrectly
+
+   * mfbase/MFEventSelector2.[h,cc]:
+     - added possibility to set a propability distribution
+
+   * mgeom/MGeomCam.[h,cc]:
+     - enhanced the Print function
+     - fixed the Clone function for the class being MGeomCam
+     - made InitGeometry public to support unsupported geometries
+
+   * mgeom/MGeomPix.h:
+     - added Copy function
+
+   * mhbase/MH3.[h,cc]:
+     - added a constructor taking a TH1 as argument
 
 

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc

@@ -150 +150 @@
 //     variable(s) of interest and the binnings)
 //
-
 MFEventSelector2::MFEventSelector2(MH3 &hist, const char *name, const char *title)
 : fHistOrig(NULL), fHistNom(&hist), fHistRes(NULL),
   fDataX(hist.GetRule('x')), fDataY(hist.GetRule('y')),
-  fDataZ(hist.GetRule('z')), fNumMax(-1)
+  fDataZ(hist.GetRule('z')), fNumMax(-1), fHistIsProbability(kFALSE)
 {
     fName  = name  ? (TString)name  : gsDefName;
@@ -384 +383 @@
     }
 
-    MRead *read = (MRead*)tasklist->FindObject("MRead");
-    if (!read)
-    {
-        *fLog << err << "MRead not found... abort." << endl;
-        return kFALSE;
-    }
-
     if (!PreProcessData(parlist))
         return kFALSE;
+
+    fHistNom->SetTitle(fHistIsProbability ? "ProbabilityDistribution" : "Users Nominal Distribution");
+
+    if (fHistIsProbability)
+        return kTRUE;
 
     InitHistogram(fHistOrig);
     InitHistogram(fHistRes);
 
-    fHistNom->SetTitle("Users Nominal Distribution");
     fHistOrig->SetTitle("Primary Distribution");
     fHistRes->SetTitle("Resulting Distribution");
@@ -407 +403 @@
 
     // Generate primary distribution
+    MRead *read = (MRead*)tasklist->FindObject("MRead");
+    if (!read)
+    {
+        *fLog << err << "MRead not found... abort." << endl;
+        return kFALSE;
+    }
+
     if (!ReadDistribution(*read))
         return kFALSE;
@@ -445 +448 @@
 
     return rc;
+}
+
+Bool_t MFEventSelector2::SelectProb(Int_t ibin) const
+{
+    //
+    // If value is outside histogram range, accept event
+    //
+    return ibin<0 ? kTRUE : fHistNom->GetHist().GetBinContent(ibin) > gRandom->Uniform();
 }
 
@@ -462 +473 @@
     const Double_t valz=fDataZ.GetValue();
 
+    const Int_t ibin = fHistNom->FindFixBin(valx, valy, valz)-1;
+
     // Get corresponding bin number and check
     // whether a selection should be made
-    fResult = Select(fHistNom->FindFixBin(valx, valy, valz)-1);
+    fResult = fHistIsProbability ? Select(ibin) : SelectProb(ibin);
 
     fCounter[fResult ? 1 : 0]++;
@@ -481 +494 @@
     if (GetNumExecutions()>0)
     {
-      *fLog << inf << endl;
-      *fLog << GetDescriptor() << " execution statistics:" << endl;
-      *fLog << dec << setfill(' ');
-      *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3)
-            << (int)(fCounter[0]*100/GetNumExecutions())
-            << "%) Events not selected" << endl;
-
-      *fLog << " " << fCounter[0] << " ("
-            << (int)(fCounter[1]*100/GetNumExecutions())
-            << "%) Events selected" << endl;
-      *fLog << endl;
+        *fLog << inf << endl;
+        *fLog << GetDescriptor() << " execution statistics:" << endl;
+        *fLog << dec << setfill(' ');
+        *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3)
+              << (int)(fCounter[0]*100/GetNumExecutions())
+              << "%) Events not selected" << endl;
+
+        *fLog << " " << fCounter[0] << " ("
+              << (int)(fCounter[1]*100/GetNumExecutions())
+              << "%) Events selected" << endl;
+        *fLog << endl;
     }
 

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.h

@@ -42 +42 @@
 
     Bool_t fResult;
+    Bool_t fHistIsProbability;
     Int_t  fCounter[2];
 
@@ -49 +50 @@
     Bool_t PreProcessData(MParList *parlist);
     Bool_t Select(Int_t bin);
+    Bool_t SelectProb(Int_t bin) const;
 
     Int_t PreProcess(MParList *parlist);
@@ -61 +63 @@
 
     void SetNumMax(Long_t max=-1) { fNumMax = max; }
+    void SetHistIsProbability(Bool_t b=kTRUE) { fHistIsProbability=b; }
     Bool_t IsExpressionTrue() const { return fResult; }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -285 +285 @@
     //
     *fLog << all << " Number of Pixels (" << GetTitle() << "): " << fNumPixels << endl;
+    *fLog << " Number of Sectors: " << GetNumSectors() << "  Area-Indices: " << GetNumAreas() << endl;
+    *fLog << " Min.Radius: " << GetMinRadius() << "  Max.Radius: " << GetMaxRadius() << endl;
 
     fPixels.Print();
@@ -296 +298 @@
 TObject *MGeomCam::Clone(const char *newname) const
 {
+    if (IsA()==MGeomCam::Class())
+    {
+        MGeomCam *cam = new MGeomCam(fNumPixels, fCamDist);
+        for (UInt_t i=0; i<fNumPixels; i++)
+            (*this)[i].Copy((*cam)[i]);
+        cam->InitGeometry();
+        return cam;
+    }
+
     return (TObject*)IsA()->New();
 }

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -39 +39 @@
     void CalcNumAreas();
     void InitOuterRing();
-    void InitGeometry()
-    {
-        CalcNumSectors();
-        CalcNumAreas();
-        CalcMaxRadius();
-        CalcPixRatio();
-        InitOuterRing();
-    }
 
 
@@ -59 +51 @@
     // the use of some camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
+    void InitGeometry()
+    {
+        CalcNumSectors();
+        CalcNumAreas();
+        CalcMaxRadius();
+        CalcPixRatio();
+        InitOuterRing();
+    }
 
     Float_t GetCameraDist() const { return fCamDist; }

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -33 +33 @@
 public:
     MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0, UInt_t s=0, UInt_t aidx=0);
+
+    void Copy(TObject &obj) const
+    {
+        MGeomPix &pix = (MGeomPix&)obj;
+        pix.fX = fX;
+        pix.fY = fY;
+        pix.fD = fD;
+        pix.fA = fA;
+        pix.fNumNeighbors = fNumNeighbors;
+        pix.fSector = fSector;
+        pix.fAidx = fAidx;
+        for (int i=0; i<6; i++)
+            pix.fNeighbors[i] = fNeighbors[i];
+    }
 
     void Print(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -166 +166 @@
 }
 
+MH3::MH3(const TH1 &h1) : fDimension(1)
+{
+    if (h1.InheritsFrom(TH3::Class()))
+        fDimension = 3;
+    if (h1.InheritsFrom(TH2::Class()))
+        fDimension = 2;
+
+    fData[0] = NULL;
+    fData[1] = NULL;
+    fData[2] = NULL;
+
+    switch (fDimension)
+    {
+    case 3:
+        fData[2] = new MDataChain(h1.GetZaxis()->GetTitle());
+    case 2:
+        fData[1] = new MDataChain(h1.GetYaxis()->GetTitle());
+    case 1:
+        fData[0] = new MDataChain(h1.GetXaxis()->GetTitle());
+    }
+
+    fName  = gsDefName;
+    fTitle = gsDefTitle;
+
+    fHist = (TH1*)h1.Clone();
+    fHist->SetDirectory(NULL);
+
+    fScale[0] = 1;
+    fScale[1] = 1;
+    fScale[2] = 1;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -39 +39 @@
 public:
     MH3(const unsigned int dim=0);
+    MH3(const TH1 &h1);
     MH3(const char *memberx);
     MH3(const char *memberx, const char *membery);