[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2249] trunk/nextgen

[<ro...@us...>]

Revision: 2249
          http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2249&view=rev
Author:   ron-fox
Date:     2010-02-10 15:00:17 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
- Fix error in handling VME_MAPPING in CVME.h/VmeModule.h
- sclclientMain.cpp must capitalize first character of state names else 
there's trouble with timing.

Modified Paths:
--------------
    trunk/nextgen/base/CopyrightTools/test
    trunk/nextgen/sbs/vmemodules/CVME.h
    trunk/nextgen/sbs/vmemodules/VmeModule.h
    trunk/nextgen/servers/portmanager/cpptest
    trunk/nextgen/utilities/scalerdisplay/scaler.tcl
    trunk/nextgen/utilities/sclclient/sclclientMain.cpp

Modified: trunk/nextgen/base/CopyrightTools/test
===================================================================
(Binary files differ)

Modified: trunk/nextgen/sbs/vmemodules/CVME.h
===================================================================
--- trunk/nextgen/sbs/vmemodules/CVME.h	2010-02-09 15:30:07 UTC (rev 2248)
+++ trunk/nextgen/sbs/vmemodules/CVME.h	2010-02-10 15:00:17 UTC (rev 2249)
@@ -157,7 +157,7 @@
 CVME<T>::CVME() :
   m_nOffset(0)
 {
-  m_pRCptr = 0;
+
 }
 
 /*

Modified: trunk/nextgen/sbs/vmemodules/VmeModule.h
===================================================================
--- trunk/nextgen/sbs/vmemodules/VmeModule.h	2010-02-09 15:30:07 UTC (rev 2248)
+++ trunk/nextgen/sbs/vmemodules/VmeModule.h	2010-02-10 15:00:17 UTC (rev 2249)
@@ -39,6 +39,7 @@
 
 #ifndef __VMEMODULE_H
 #define __VMEMODULE_H
+#define HAVE_VME_MAPPING	/* This is the SBS interface thing after all. */
 
 #ifndef __CVME_H
 #include <CVME.h>

Modified: trunk/nextgen/servers/portmanager/cpptest
===================================================================
--- trunk/nextgen/servers/portmanager/cpptest	2010-02-09 15:30:07 UTC (rev 2248)
+++ trunk/nextgen/servers/portmanager/cpptest	2010-02-10 15:00:17 UTC (rev 2249)
@@ -18,12 +18,12 @@
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-relink_command="(cd /scratch/nextgen/servers/portmanager; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/root/bin:/usr/bin/mh:/usr/sbin/:/sbin\"; export PATH; g++ -g -O2 -o \$progdir/\$file cpptest.o  -L/scratch/nextgen/servers/portmanager /scratch/nextgen/servers/portmanager/.libs/libPortManager.so -L/scratch/nextgen/base/exception /scratch/nextgen/base/exception/.libs/libException.so -lpub -lX11 -Wl,--rpath -Wl,/scratch/nextgen/servers/portmanager/.libs -Wl,--rpath -Wl,/scratch/nextgen/base/exception/.libs -Wl,--rpath -Wl,/usr/opt/daq/10.0/lib)"
+relink_command="(cd /scratch/fox/daq/nextgen/servers/portmanager; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/bin:/usr/bin:/soft/intel/java/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/user/fox/bin:.:/var/lib/gems/1.8/bin/\"; export PATH; g++ -g -O2 -o \$progdir/\$file cpptest.o  -L/scratch/fox/daq/nextgen/servers/portmanager /scratch/fox/daq/nextgen/servers/portmanager/.libs/libPortManager.so -L/scratch/fox/daq/nextgen/base/exception /scratch/fox/daq/nextgen/base/exception/.libs/libException.so -lpub -lX11 -Wl,--rpath -Wl,/scratch/fox/daq/nextgen/servers/portmanager/.libs -Wl,--rpath -Wl,/scratch/fox/daq/nextgen/base/exception/.libs -Wl,--rpath -Wl,/usr/opt/daq/10.0/lib)"
 
 # This environment variable determines our operation mode.
 if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
   # install mode needs the following variable:
-  notinst_deplibs=' /scratch/nextgen/servers/portmanager/libPortManager.la /scratch/nextgen/base/exception/libException.la'
+  notinst_deplibs=' /scratch/fox/daq/nextgen/servers/portmanager/libPortManager.la /scratch/fox/daq/nextgen/base/exception/libException.la'
 else
   # When we are sourced in execute mode, $file and $echo are already set.
   if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then

Modified: trunk/nextgen/utilities/scalerdisplay/scaler.tcl
===================================================================
--- trunk/nextgen/utilities/scalerdisplay/scaler.tcl	2010-02-09 15:30:07 UTC (rev 2248)
+++ trunk/nextgen/utilities/scalerdisplay/scaler.tcl	2010-02-10 15:00:17 UTC (rev 2249)
@@ -596,7 +596,7 @@
     }
     
     if {$State == "Active" } {
-        DoUpdate
+       DoUpdate
     } else {
         DoUpdate 1
     }
@@ -983,6 +983,7 @@
     global pageAlarmState
     global Notebook
 
+
     set pageAlarmState($page) 0
 
     set lines [$widget index end]
@@ -1269,7 +1270,6 @@
         puts "command ignored"
         return
     }
-    puts "Setting scaler $name $id"
     set ScalerMap($name) $id
 }
 

Modified: trunk/nextgen/utilities/sclclient/sclclientMain.cpp
===================================================================
--- trunk/nextgen/utilities/sclclient/sclclientMain.cpp	2010-02-09 15:30:07 UTC (rev 2248)
+++ trunk/nextgen/utilities/sclclient/sclclientMain.cpp	2010-02-10 15:00:17 UTC (rev 2249)
@@ -327,19 +327,19 @@
   command = "set RunState ";
   switch (type) {
   case BEGIN_RUN:
-    command += "active";
+    command += "Active";
     stateproc = "BeginRun";
     break;
   case RESUME_RUN:
-    command += "active";
+    command += "Active";
     stateproc = "ResumeRun";
     break;
   case PAUSE_RUN:
-    command += "paused";
+    command += "Paused";
     stateproc = "PauseRun";
     break;
   case END_RUN:
-    command += "inactive";
+    command += "Inactive";
     stateproc= "EndRun";
     break;
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.