Changeset 9312 for trunk/MagicSoft/Mars/mhist

Timestamp:

02/10/09 20:00:10 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (13 diffs)
• MHCamEvent.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -91 +91 @@
 //
 MHCamEvent::MHCamEvent(const char *name, const char *title)
-: fSum(NULL), fEvt(NULL), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+: fSum(NULL), fErr(NULL), fEvt(NULL), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
 fThreshold(0), fUseThreshold(0)
 {
@@ -104 +104 @@
 //
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
-: fSum(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+: fSum(NULL), fErr(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
 fThreshold(0), fUseThreshold(0)
 {
@@ -120 +120 @@
     if (fSum)
         delete fSum;
+}
+
+Bool_t MHCamEvent::InitGeom(const MParList &plist)
+{
+    MGeomCam *cam = (MGeomCam*)plist.FindObject(fNameGeom, "MGeomCam");
+    if (!cam)
+    {
+        *fLog << err << fNameGeom << " [MGeomCam] not found... abort." << endl;
+        return kFALSE;
+    }
+
+    // combine name
+    const TString name = fNameEvt.IsNull() ? fName : fNameEvt;
+
+    fSum->SetGeometry(*cam, name+";avg");
+    if (fTitle!=gsDefTitle)
+        fSum->SetTitle(fTitle);
+    if (!fTitle.Contains(";"))
+        fSum->SetYTitle("a.u.");
+
+    if (fErr)
+        fErr->SetGeometry(*fSum->GetGeometry(), fErr->GetName(), fErr->GetTitle());
+
+    return kTRUE;
 }
 
@@ -142 +166 @@
     }
 
-    MGeomCam *cam = (MGeomCam*)plist->FindObject(fNameGeom, "MGeomCam");
-    if (!cam)
-    {
-        *fLog << err << fNameGeom << " [MGeomCam] not found... abort." << endl;
+    fSum->Reset();
+
+    fNumReInit = 0;
+
+    if (!InitGeom(*plist))
         return kFALSE;
-    }
-
-    // combine name
-    const TString name = fNameEvt.IsNull() ? fName : fNameEvt;
-
-    fSum->Reset();
-    fSum->SetGeometry(*cam, name+";avg");
-
-    if (fTitle!=gsDefTitle)
-        fSum->SetTitle(fTitle);
-    if (!fTitle.Contains(";"))
-        fSum->SetYTitle("a.u.");
+
     if (fUseThreshold!=kCollectMin && fUseThreshold!=kCollectMax)
         fSum->SetBit(MHCamera::kProfile);
@@ -169 +183 @@
 // --------------------------------------------------------------------------
 //
+// The geometry read from the RunHeaders might have changed. This does not
+// effect anything in PreProcess. So we set a new geometry. We don't move
+// this away from PreProcess to support also loops without calling ReInit.
+//
+Bool_t MHCamEvent::ReInit(MParList *plist)
+{
+    return fNumReInit++==0 ? InitGeom(*plist) : kTRUE;
+}
+
+
+// --------------------------------------------------------------------------
+//
 // Fill the histograms with data from a MCamEvent-Container.
 //
@@ -250 +276 @@
 }
 
+TString MHCamEvent::Format(const char *ext) const
+{
+    TString n = fSum->GetName();
+
+    const Ssiz_t pos = n.Last(';');
+    if (pos<0)
+        return "";
+
+    n  = n(0, pos);
+    n += ";";
+    n += ext;
+    return n;
+}
+
 void MHCamEvent::Paint(Option_t *)
 {
@@ -255 +295 @@
 
     pad->cd(2);
-    if (gPad->FindObject(MString::Format("%s;proj", fName.Data())))
-    {
-        TH1 *h=fSum->Projection(MString::Format("%s;proj", fName.Data()));
+    if (gPad->FindObject(Format("proj")))
+    {
+        TH1 *h=fSum->Projection(Format("proj"));
         if (h->GetMaximum()>0)
             gPad->SetLogy();
@@ -263 +303 @@
 
     pad->cd(5);
-    if (gPad->FindObject(MString::Format("%s;rad", fName.Data())))
-        fSum->RadialProfile(MString::Format("%s;rad", fName.Data()));
+    if (gPad->FindObject(Format("rad")))
+        fSum->RadialProfile(Format("rad"));
 
     pad->cd(6);
-    if (gPad->FindObject(MString::Format("%s;az", fName.Data())))
-        fSum->AzimuthProfile(MString::Format("%s;az", fName.Data()));
+    if (gPad->FindObject(Format("az")))
+        fSum->AzimuthProfile(Format("az"));
 
     pad->cd(4);
     gPad->cd(1);
-    MHCamera *cam = (MHCamera*)gPad->FindObject(MString::Format("%s;err", fName.Data()));
+    MHCamera *cam = (MHCamera*)gPad->FindObject(Format("err"));
     if (cam)
         cam->SetCamContent(*fSum, fErrorRelative ? 1 : 2);
@@ -300 +340 @@
     p->Draw();
     p->cd();
-    TH1 *h = fSum->Projection(MString::Format("%s;proj", fName.Data()), 50);
+    TH1 *h = fSum->Projection(Format("proj"), 50);
     h->SetTitle("Projection");
     h->SetBit(kCanDelete);
@@ -328 +368 @@
         e += "/v_{i}";
 
-    MHCamera *cam = new MHCamera(*fSum->GetGeometry());
-    cam->SetName(MString::Format("%s;err", fName.Data()));
-    cam->SetTitle(e);
-    cam->SetYTitle(fSum->GetYaxis()->GetTitle());
-    cam->SetCamContent(*fSum, fErrorRelative ? 1 : 2);
-    cam->SetBit(kCanDelete);
-    cam->Draw();
+    fErr = new MHCamera(*fSum->GetGeometry());
+    fErr->SetName(Format("err"));
+    fErr->SetTitle(e);
+    fErr->SetYTitle(fSum->GetYaxis()->GetTitle());
+    fErr->SetCamContent(*fSum, fErrorRelative ? 1 : 2);
+    fErr->SetBit(kMustCleanup);
+    fErr->SetBit(kCanDelete);
+    fErr->Draw();
 
     pad->cd();
@@ -343 +384 @@
     p->Draw();
     p->cd();
-    h = (TH1*)fSum->RadialProfile(MString::Format("%s;rad", fName.Data()), 20);
+    h = (TH1*)fSum->RadialProfile(Format("rad"), 20);
     h->SetTitle("Radial Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
@@ -355 +396 @@
     p->Draw();
     p->cd();
-    h = (TH1*)fSum->AzimuthProfile(MString::Format("%s;az", fName.Data()), 30);
+    h = (TH1*)fSum->AzimuthProfile(Format("az"), 30);
     h->SetTitle("Azimuth Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
@@ -361 +402 @@
 }
 
+
+void MHCamEvent::RecursiveRemove(TObject *obj)
+{
+    if (obj==fErr)
+        fErr = 0;
+}

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -17 +17 @@
 protected:
     MHCamera  *fSum;       // storing the sum
+    MHCamera  *fErr;       //! storing the err
     MCamEvent *fEvt;       //! the current event
 
@@ -29 +30 @@
     Char_t fUseThreshold;  // Use a threshold? Which direction has it?
 
-    void Init(const char *name, const char *title);
+    Int_t fNumReInit;      //!
+
+    TString Format(const char *ext) const;
+
+    void   Init(const char *name, const char *title);
+    Bool_t InitGeom(const MParList &plist);
 
     Bool_t SetupFill(const MParList *pList);
+    Bool_t ReInit(MParList *plist);
     Int_t  Fill(const MParContainer *par, const Stat_t w=1);
 
@@ -62 +69 @@
     void SetErrorRelative(Bool_t b=kTRUE) { fErrorRelative = b; }
 
+    void RecursiveRemove(TObject *obj);
+
     ClassDef(MHCamEvent, 2) // Histogram to sum camera events
 };