Changeset 959 for trunk/MagicSoft/Mars/mdatacheck

Timestamp:

10/02/01 14:46:56 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdatacheck

Files:

• DataCheckLinkDef.h (modified) (1 diff)
• MDumpEvtHeader.cc (modified) (3 diffs)
• MGDisplayAdc.cc (modified) (7 diffs)
• MGDisplayAdc.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
-#pragma link C++ class MShowSpect;
-#pragma link C++ class MViewAdcSpectra;
+//#pragma link C++ class MShowSpect;
+//#pragma link C++ class MViewAdcSpectra;
 #pragma link C++ class MDumpEvtHeader;
 

trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc

@@ -24 +24 @@
 \* ======================================================================== */
 
+//////////////////////////////////////////////////////////////////////////////
+//
+//  MDumpEvtHeader
+//
+//  Print out some event header information to the screen. This maybe useful
+//  if you are not sure what the events in the file conatins or you
+//  want to check for the contents.
+//
+//  Input Containers:
+//   MRawEvtHeader, MRawEvtData
+//
+//  Output Containers:
+//   -/-
+//
+//////////////////////////////////////////////////////////////////////////////
+
 #include "MDumpEvtHeader.h"
 
@@ -33 +49 @@
 #include "MRawEvtPixelIter.h"
 
-ClassImp(MDumpEvtHeader)
+ClassImp(MDumpEvtHeader);
 
+// --------------------------------------------------------------------------
+//
+// Preprocessing of class. Check for the two container which should
+// get printed by the Process-function: MRawEvtHeader and MRawEvtData.
+// If one of the two doesn't exist (input containers) stop processing of
+// data.
+//
 Bool_t MDumpEvtHeader::PreProcess (MParList *pList)
 {
@@ -54 +77 @@
 } 
 
+// --------------------------------------------------------------------------
+//
+// Print out information of the actual event (header) and print the
+// pixel ID's of all pixels in this event.
+//
 Bool_t MDumpEvtHeader::Process()
 {
-  fRawEvtHeader->Print();
+    fRawEvtHeader->Print();
 
-  MRawEvtPixelIter pixel(fRawEvtData);
+    MRawEvtPixelIter pixel(fRawEvtData);
 
-  while (pixel.Next())
-      *fLog << " " << pixel.GetPixelId();
+    while (pixel.Next())
+        *fLog << " " << pixel.GetPixelId();
 
-  *fLog << endl;
-  
-  return kTRUE;
-} 
+    *fLog << endl;
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc

@@ -66 +66 @@
     fHistoList = new TGListBox (left, M_LIST_HISTO);
     fHistoList->Associate(this);
-    fHistoList->Resize(80, 405);
+    fHistoList->Resize(100, 405);
 
     fList->Add(fHistoList);
@@ -126 +126 @@
     // ---
 
-    TGLayoutHints *laybut1 = new TGLayoutHints(kLHintsNormal, 10, 10,  0, 10);
-    TGLayoutHints *laybut2 = new TGLayoutHints(kLHintsNormal, 10, 10, 10,  5);
+    TGLayoutHints *laybut1 = new TGLayoutHints(kLHintsCenterX|kLHintsTop, 10, 10,  0, 10);
+    TGLayoutHints *laybut2 = new TGLayoutHints(kLHintsCenterX|kLHintsTop, 10, 10, 10,  5);
+    TGLayoutHints *layslid = new TGLayoutHints(kLHintsCenterX|kLHintsTop);
 
     fList->Add(laybut1);
     fList->Add(laybut2);
-
-    mid->AddFrame(prev,   laybut1);
-    mid->AddFrame(fSlider);
-    mid->AddFrame(next,   laybut2);
-    mid->AddFrame(group,  laybut2);
+    fList->Add(layslid);
+
+    mid->AddFrame(prev,    laybut1);
+    mid->AddFrame(fSlider, layslid);
+    mid->AddFrame(next,    laybut2);
+    mid->AddFrame(group,   laybut2);
 
     //
     //    right part of top frame
     //
-    TGVerticalFrame *right = new TGVerticalFrame(frame, 60, 60, kFitWidth);
+    TGVerticalFrame *right = new TGVerticalFrame(frame, 100, 100, kFitWidth);
     fList->Add(right);
 
-    TRootEmbeddedCanvas *canvas = new TRootEmbeddedCanvas("fECanv", right, 800, 400);
+    TRootEmbeddedCanvas *canvas = new TRootEmbeddedCanvas("fECanv", right, 100, 100);
     fList->Add(canvas);
 
@@ -156 +158 @@
     fList->Add(reset);
 
-    TGLayoutHints *layreset = new TGLayoutHints(kLHintsCenterX|kLHintsTop,10, 10, 0, 10);
+    TGLayoutHints *layreset = new TGLayoutHints(kLHintsCenterX|kLHintsTop, 10, 10, 0, 10);
     fList->Add(layreset);
 
@@ -211 +213 @@
                            UInt_t w, UInt_t h,
                            UInt_t options)
-: TGTransientFrame(p, main, w, h, options), fHists(histos), fHistoType(M_RADIO_HI)
-{
+: TGTransientFrame(p?p:gClient->GetRoot(), main?main:gClient->GetRoot(), w, h, options),
+  fHistoType(M_RADIO_LH)
+{
+    fHists = (MHFadcCam*)histos->Clone();
+
     fList = new TList;
     fList->SetOwner();
@@ -265 +270 @@
 
     MapWindow();
-    SetWMSizeHints(550, 550, 1000, 1000, 1, 1);
+    SetWMSizeHints(950, 500, 1000, 1000, 1, 1);
 }  
 
@@ -271 +276 @@
 { 
     delete fList;
+    delete fHists;
 }  
 
@@ -277 +283 @@
 void MGDisplayAdc::CloseWindow()
 {
-    // Got close message for this MainFrame. Calls parent CloseWindow()
-    // (which destroys the window) and terminate the application.
+    //
     // The close message is generated by the window manager when its close
     // window menu item is selected.

trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h

@@ -41 +41 @@
 
     MGDisplayAdc(MHFadcCam *fHists ,
-                 const TGWindow *p, const TGWindow *main,
-                 UInt_t w, UInt_t h,
-                 UInt_t options = kMainFrame | kVerticalFrame );
+                 const TGWindow *p=NULL, const TGWindow *main=NULL,
+                 UInt_t w=800, UInt_t h=500,
+                 UInt_t options = kMainFrame|kVerticalFrame);
 
     ~MGDisplayAdc();

trunk/MagicSoft/Mars/mdatacheck/Makefile

@@ -29 +29 @@
 
 SRCFILES = MDumpEvtHeader.cc \
-           MGDisplayAdc.cc \
-           MShowSpect.cc \
-           MViewAdcSpectra.cc 
+           MGDisplayAdc.cc
 
 SRCS    = $(SRCFILES)