Changeset 2492 for trunk

Timestamp:

11/10/03 11:32:23 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• Makefile (modified) (2 diffs)
• Makefile.rules (modified) (1 diff)
• mbase/MReadSocket.cc (modified) (1 diff)
• mmain/MStatusDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
 
-  2003/11/10: Thomas Bretz
+ 2003/11/10: Thomas Bretz
   
    * macros/dohtml.C:
@@ -71 +71 @@
 
 
-  
-  2003/11/08: Nicola Galante
+
+ 2003/11/08: Nicola Galante
 
    * mhistmc/MHMcTriggerLvl2.[cc,h]:
@@ -90 +90 @@
 
 
-  2003/11/07: Thomas Bretz
+ 2003/11/07: Thomas Bretz
   
    * mmain/MCameraDisplay.cc:
@@ -155 +155 @@
 
 
-  2003/11/06: Antonio Stamerra
+ 2003/11/06: Antonio Stamerra
 
    * manalysis/MMcTriggerLvl2.cc
@@ -162 +162 @@
 
 
-  2003/11/05: Wolfgang Wittek
+ 2003/11/05: Wolfgang Wittek
 
    * macros/CT1Analysis.C, macros/ONOFFCT1Analysis.C:

trunk/MagicSoft/Mars/Makefile

@@ -21 +21 @@
 
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readraw merpp mars
+PROGRAMS = readraw merpp star mars
 SOLIB    = libmars.so
 CINT     = M
@@ -132 +132 @@
         root -b -q dohtml.C
 
-clean:  rmcint rmobjs rmcore rmlib
+clean:  rmmake rmcint rmobjs rmcore rmlib
 
-mrproper:       $(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean
+mrproper:       $(MRPROPERS) rmmake rmbin rmbak rmbakmac rmhtml clean
         @echo " Done."
         @echo " "

trunk/MagicSoft/Mars/Makefile.rules

@@ -26 +26 @@
 # The cleaning facility
 #
+
+rmmake: 
+        @echo " Removing Makefile.depend"
+        @rm -f Makefile.depend
 
 rmcint: 

trunk/MagicSoft/Mars/mbase/MReadSocket.cc

@@ -193 +193 @@
 //  use operator!() or operator void*() or fail()
 //
-Bool_t MReadSocket::Open(int port, Bool_t block=kFALSE)
+Bool_t MReadSocket::Open(int port, Bool_t block)
 {
     //

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -894 +894 @@
     // in the same thread
     //
-    if (mutex->TryLock()==13)
+    if (fMutex->TryLock()==13)
         return;
 
@@ -927 +927 @@
     //c->Paint();
 
-    mutex->UnLock();
+    fMutex->UnLock();
 }