Changeset 7297 for trunk/MagicSoft/Mars/mhist

Timestamp:

08/22/05 10:46:31 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.h (modified) (2 diffs)
• MHEvent.cc (modified) (4 diffs)
• MHEvent.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -221 +221 @@
     void     SetInvDeepBlueSeaPalette(); // *MENU*
 
-    void     SetAutoScale() { fMinimum = fMaximum = -1111; } // *MENU*
-
     void     SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed
     Bool_t   IsFreezed() const { return TestBit(kFreezed); }
@@ -228 +226 @@
 
     void     SetAbberation(Float_t f=0.0713) { fAbberation=f; } // *MENU*
+
+    void     SetAutoScale() { fMinimum = fMaximum = -1111; } // *MENU*
+    void     SetMinMax(Double_t min=-1111, Double_t max=-1111) { SetMinimum(min); SetMaximum(max); } // *MENU*
 
     void     AddNotify(TObject *event);

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -71 +71 @@
 // --------------------------------------------------------------------------
 //
-MHEvent::MHEvent(EventType_t type) : fHist(NULL), fType(type)
+MHEvent::MHEvent(EventType_t type) : fHist(NULL), fType(type),
+    fMinimum(-1111), fMaximum(-1111)
 {
     fName = "MHEvent";
@@ -121 +122 @@
     fHist = new MHCamera(*cam);
     fHist->AddNotify(fClone);
+
+    fHist->SetMinimum(fMinimum);
+    fHist->SetMaximum(fMaximum);
 
     switch (fType)
@@ -167 +171 @@
         break;
      case kEvtArrTime:
+     case kEvtArrTimeCleaned:
         fHist->SetName("Arrival Time");
         fHist->SetYTitle("t [slice id]");
@@ -241 +246 @@
     case kEvtArrTime:
         fHist->SetCamContent(*event, 6);
+        break; 
+    case kEvtArrTimeCleaned:
+        fHist->SetCamContent(*event, 8);
         break; 
     case kEvtTrigPix:

trunk/MagicSoft/Mars/mhist/MHEvent.h

@@ -25 +25 @@
         kEvtPedPhot, kEvtPedPhotRMS,
         kEvtCleaningLevels, kEvtCleaningData,
-        kEvtIdxMax, kEvtArrTime, kEvtTrigPix, kEvtIslandIndex
+        kEvtIdxMax, kEvtArrTime, kEvtArrTimeCleaned,
+        kEvtTrigPix, kEvtIslandIndex
     };
 
@@ -45 +46 @@
     EventType_t fType;
 
+    Double_t fMinimum;
+    Double_t fMaximum;
+
     TH1 *GetHistByName(const TString name) const { return (TH1*)fHist; }
 
@@ -53 +57 @@
     MHEvent(EventType_t type=kEvtSignalRaw);
     ~MHEvent();
+
+    void SetMinimum(Double_t min=-1111) { fMinimum=min; }
+    void SetMaximum(Double_t max=-1111) { fMaximum=max; }
 
     MHCamera *GetHist() { return fHist; }