Changeset 585 for trunk/MagicSoft

Timestamp:

01/22/01 16:41:33 (24 years ago)

Author:

harald

Message:

Adding some new code to start with the development of the usecase
"Event Display".

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (2 diffs)
• Makefile.depend (modified) (1 diff)
• mbase/MReadTree.cc (modified) (1 diff)
• mbase/MReadTree.h (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (1 diff)
• readraw.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Makefile

@@ -35 +35 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mgui mdatacheck mbase mraw mmc
+SUBDIRS = mgui meventdisp mdatacheck mbase mraw mmc
 
 LIBRARIES = $(SUBDIRS:=.a)
@@ -93 +93 @@
         @cd mmc; make mrproper; cd ..
         @echo "cd .."
+        @echo "cd meventdisp"
+        @cd meventdisp; make mrproper; cd ..
+        @echo "cd .."
+
 
 

trunk/MagicSoft/Mars/Makefile.depend

@@ -8 +8 @@
 
 # DO NOT DELETE
+
+MGFadcDisp.o: MGFadcDisp.h ../mbase/MAGIC.h /cern/root/include/TROOT.h
+MGFadcDisp.o: /cern/root/include/TDirectory.h /cern/root/include/TNamed.h
+MGFadcDisp.o: /cern/root/include/TObject.h /cern/root/include/Rtypes.h
+MGFadcDisp.o: /cern/root/include/RConfig.h /cern/root/include/RVersion.h
+MGFadcDisp.o: /usr/include/stdio.h /usr/include/features.h
+MGFadcDisp.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
+MGFadcDisp.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
+MGFadcDisp.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h
+MGFadcDisp.o: /usr/include/bits/types.h /usr/include/libio.h
+MGFadcDisp.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
+MGFadcDisp.o: /cern/root/include/DllImport.h /cern/root/include/Varargs.h
+MGFadcDisp.o: /cern/root/include/TStorage.h /cern/root/include/TBuffer.h
+MGFadcDisp.o: /cern/root/include/Bytes.h /usr/include/string.h
+MGFadcDisp.o: /cern/root/include/TList.h /cern/root/include/TSeqCollection.h
+MGFadcDisp.o: /cern/root/include/TCollection.h /cern/root/include/TIterator.h
+MGFadcDisp.o: /cern/root/include/TString.h /cern/root/include/TMath.h
+MGFadcDisp.o: /cern/root/include/TRefCnt.h /cern/root/include/TDatime.h
+MGFadcDisp.o: /cern/root/include/Htypes.h /cern/root/include/TGFrame.h
+MGFadcDisp.o: /cern/root/include/TGWindow.h /cern/root/include/TGObject.h
+MGFadcDisp.o: /cern/root/include/GuiTypes.h /cern/root/include/TGClient.h
+MGFadcDisp.o: /cern/root/include/TVirtualX.h /cern/root/include/TAttLine.h
+MGFadcDisp.o: /cern/root/include/Gtypes.h /cern/root/include/TAttFill.h
+MGFadcDisp.o: /cern/root/include/TAttText.h /cern/root/include/TAttMarker.h
+MGFadcDisp.o: /cern/root/include/TGDimension.h /cern/root/include/TGLayout.h
+MGFadcDisp.o: /cern/root/include/TGString.h /cern/root/include/TGButton.h
+MGFadcDisp.o: /cern/root/include/TGWidget.h
+MGFadcDisp.o: /cern/root/include/WidgetMessageTypes.h
+MGFadcDisp.o: /cern/root/include/TGLabel.h /cern/root/include/TGSplitter.h
+MGFadcDisp.o: /cern/root/include/TGTab.h /cern/root/include/TGListBox.h
+MGFadcDisp.o: /cern/root/include/TGCanvas.h /cern/root/include/TGSlider.h
+MGFadcDisp.o: /cern/root/include/TRootEmbeddedCanvas.h
+MGFadcDisp.o: /cern/root/include/TGTextEntry.h
+MGFadcDisp.o: /cern/root/include/TGTextBuffer.h

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -159 +159 @@
 }
 
+Bool_t MReadTree::GetEvent() 
+{
+  // Get the Event with the current EventNumber fNumEntry 
+  //
+  fTree->GetEntry(fNumEntry );
+
+  return kTRUE;
+}
 Bool_t MReadTree::DecEventNum(UInt_t dec)
 {

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -28 +28 @@
     Bool_t PostProcess();
 
-    //    Bool_t GetEvent(Int_t num ) ; 
+    Bool_t GetEvent() ; 
 
     Bool_t DecEventNum(UInt_t dec=1); // decrease number of event (position in tree)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -155 +155 @@
     
     TGraph *graph = new TGraph(n, x, y);
+    graph->SetMaximum (256) ; 
+    graph->SetMinimum (0) ; 
+    
     graph->Draw("AC*");
     

trunk/MagicSoft/Mars/readraw.cc

@@ -18 +18 @@
 #include "MInputStreamID.h"
 
-#include "MMcEvt.hxx"
+#include "MMcEvt.hxx" 
+#include "MMcTrig.hxx" 
 
 #include "MGMarsMain.h"
@@ -68 +69 @@
 
     MMcEvt         *evtmc     = new MMcEvt() ; 
+    MMcTrig        *trigmc    = new MMcTrig() ; 
 
     //
@@ -129 +131 @@
             evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate);
 
+        if ( ! strcmp(name, "MMcTrig") )
+          evttree->GetBranch("MMcTrig")->SetAddress(&trigmc);
+        
         if (!strcmp(name, "MMcEvt"))
             evttree->GetBranch("MMcEvt")->SetAddress(&evtmc);
 
-        if (!strcmp(name, "MMcTrig"))
-            cout << " Not able to connect to class MMcTrig yet." << endl;
     }