- Rearranged directory structure for forking out ANSTO

- Refactored site specific stuff into a site module - PSI specific stuff is now in the PSI directory. - The old version has been tagged with pre-ansto SKIPPED: psi/A1931.c psi/A1931.h psi/amor2t.c psi/amor2t.h psi/amor2t.i psi/amor2t.tex psi/amor2t.w psi/amorscan.c psi/amorscan.h psi/amorscan.w psi/amorstat.c psi/amorstat.h psi/amorstat.i psi/amorstat.tex psi/amorstat.w psi/bruker.c psi/bruker.h psi/bruker.w psi/buffer.c psi/buffer.h psi/dilludriv.c psi/dilludriv.h psi/dmc.c psi/dmc.h psi/dmc.w psi/docho.c psi/ecb.c psi/ecb.h psi/ecb.i psi/ecb.w psi/ecbdriv.c psi/ecbdriv.h psi/el734dc.c psi/el734driv.c psi/el755driv.c psi/el755driv.h psi/faverage.c psi/faverage.h psi/faverage.tex psi/faverage.w psi/fowrite.c psi/fowrite.h psi/itc4.c psi/itc4.h psi/itc4.w psi/itc4driv.c psi/ltc11.c psi/ltc11.h psi/nextrics.c psi/nextrics.h psi/nxamor.c psi/nxamor.h psi/nxamor.tex psi/nxamor.w psi/pimotor.c psi/pimotor.h psi/pimotor.tex psi/pimotor.w psi/pipiezo.c psi/polterwrite.c psi/polterwrite.h psi/psi.c psi/ruli.c psi/ruli.h psi/sanscook.c psi/sanswave.c psi/sanswave.h psi/sanswave.tex psi/sanswave.w psi/serial.c psi/serial.h psi/serial.w psi/sinqhmdriv.c psi/sinqhmdriv.i psi/sinqhmdriv.w psi/slsmagnet.c psi/sps.c psi/sps.h psi/sps.i psi/sps.tex psi/sps.w psi/swmotor.c psi/swmotor.h psi/swmotor.i psi/tas.c psi/tas.h psi/tas.tex psi/tas.w psi/tasdrive.c psi/tasinit.c psi/tasscan.c psi/tasu.h psi/tasutil.c psi/tdchm.c psi/tdchm.h psi/tecsdriv.c psi/tecsdriv.h psi/velodorn.c psi/velodorn.h psi/velodorn.w psi/velodornier.c psi/hardsup/README psi/hardsup/StrMatch.c psi/hardsup/asynsrv_def.h psi/hardsup/asynsrv_errcodes.h psi/hardsup/asynsrv_mark.c psi/hardsup/asynsrv_utility.c psi/hardsup/c_interfaces.c psi/hardsup/dillutil.c psi/hardsup/dillutil.h psi/hardsup/el734_def.h psi/hardsup/el734_errcodes.h psi/hardsup/el734_utility.c psi/hardsup/el734fix.h psi/hardsup/el734tcl.c psi/hardsup/el737_def.h psi/hardsup/el737_errcodes.h psi/hardsup/el737_utility.c psi/hardsup/el737fix.h psi/hardsup/el737tcl.c psi/hardsup/el755_def.h psi/hardsup/el755_errcodes.h psi/hardsup/el755_errorlog.c psi/hardsup/el755_utility.c psi/hardsup/err.c psi/hardsup/failinet.c psi/hardsup/geterrno.c psi/hardsup/itc4util.c psi/hardsup/itc4util.h psi/hardsup/make_gen psi/hardsup/makefile_alpha psi/hardsup/makefile_linux psi/hardsup/makeprint.c psi/hardsup/rs232c_def.h psi/hardsup/serialsinq.c psi/hardsup/serialsinq.h psi/hardsup/sinq_defs.h psi/hardsup/sinq_prototypes.h psi/hardsup/sinqhm.c psi/hardsup/sinqhm.h psi/hardsup/sinqhm_def.h psi/hardsup/stredit.c psi/hardsup/strjoin.c psi/hardsup/table.c psi/hardsup/table.h psi/hardsup/velsel_def.h psi/hardsup/velsel_utility.c psi/motor/Makefile psi/motor/el734_test psi/motor/el734_test.c psi/motor/makeprint.c psi/sinqhm/FOCUS_gbl.h psi/sinqhm/FOCUS_srv_main.c psi/sinqhm/Makefile psi/sinqhm/SinqHM_bootParamsConfig.c psi/sinqhm/SinqHM_bootUtil.c psi/sinqhm/SinqHM_def.h psi/sinqhm/SinqHM_gbl.h psi/sinqhm/SinqHM_srv_filler.c psi/sinqhm/SinqHM_srv_main.c psi/sinqhm/SinqHM_srv_routines.c psi/sinqhm/SinqHM_srv_server.c psi/sinqhm/bld psi/sinqhm/bld2 psi/sinqhm/bldmen psi/sinqhm/hist_mem_notes.tex psi/sinqhm/hist_mem_spec.tex psi/sinqhm/hist_mem_spec_fig1.ps psi/sinqhm/hist_mem_spec_fig2.ps psi/sinqhm/hist_mem_spec_fig3.ps psi/sinqhm/hist_mem_spec_fig4.ps psi/sinqhm/lwl_client.c psi/sinqhm/lwl_server.c psi/sinqhm/make_sinqhm.com psi/sinqhm/monitor.c psi/sinqhm/psi_logo.ps psi/sinqhm/sinq_logo.ps psi/sinqhm/sinqhm_bootutil_client.c psi/sinqhm/sinqhm_client.c psi/sinqhm/sinqhm_ctrl.c psi/sinqhm/usrConfig.c psi/sinqhm/usrConfig.c_diffs psi/sinqhm/usrConfig2604.c psi/sinqhm/vmio10_def.h psi/sinqhm/vmio_utility.c psi/tecs/coc_client.c psi/tecs/coc_client.h psi/tecs/coc_logfile.c psi/tecs/coc_logfile.h psi/tecs/coc_server.c psi/tecs/coc_server.h psi/tecs/coc_util.c psi/tecs/coc_util.h psi/tecs/fortify1.c psi/tecs/instr_hosts.c psi/tecs/instr_hosts.h psi/tecs/keep_running.c psi/tecs/make_gen psi/tecs/make_opt psi/tecs/make_opt_alpha psi/tecs/make_opt_llc psi/tecs/makefile psi/tecs/makefile_alpha psi/tecs/makefile_linux psi/tecs/myc_buf.c psi/tecs/myc_buf.h psi/tecs/myc_err.c psi/tecs/myc_err.h psi/tecs/myc_fortran.h psi/tecs/myc_mem.h psi/tecs/myc_str.c psi/tecs/myc_str.h psi/tecs/myc_time.c psi/tecs/myc_time.h psi/tecs/myc_tmp.c psi/tecs/myc_tmp.h psi/tecs/rstart.c psi/tecs/six.c psi/tecs/str.f psi/tecs/sys_cmdpar.f psi/tecs/sys_date.f psi/tecs/sys_env.c psi/tecs/sys_get_key.f psi/tecs/sys_getenv.f psi/tecs/sys_lun.f psi/tecs/sys_open.f psi/tecs/sys_open_alpha.f psi/tecs/sys_rdline.c psi/tecs/sys_select.c psi/tecs/sys_select.h psi/tecs/sys_unix.c psi/tecs/sys_wait.f psi/tecs/tecs.bld psi/tecs/tecs.c psi/tecs/tecs.tcl psi/tecs/tecs_c.c psi/tecs/tecs_c.h psi/tecs/tecs_cli.c psi/tecs/tecs_cli.h psi/tecs/tecs_client.f psi/tecs/tecs_data.c psi/tecs/tecs_data.h psi/tecs/tecs_dlog.inc psi/tecs/tecs_for.f psi/tecs/tecs_lsc.c psi/tecs/tecs_lsc.h psi/tecs/tecs_plot.f psi/tecs/tecs_serial.c psi/tecs/tecs_serial.h psi/tecs/term.c psi/tecs/term.h psi/utils/Makefile psi/utils/SerPortServer.c psi/utils/asynsrv_test.c psi/utils/ecb-load.c psi/utils/el734.c psi/utils/el734_test.c psi/utils/el737.c psi/utils/make.ecb psi/utils/check/amorcheck psi/utils/check/dmccheck psi/utils/check/focuscheck psi/utils/check/focusstatus.tcl psi/utils/check/hrptcheck psi/utils/check/sanscheck psi/utils/check/sicssyntax.tex psi/utils/check/sicssyntaxlib.tcl psi/utils/check/test.tcl psi/utils/check/topsicheck psi/utils/check/tricscheck psi/utils/check/tst
2003-06-20 10:17:44 +00:00
parent 6819991e85
commit e3cd728ecb
412 changed files with 695 additions and 139541 deletions
--- a/ofac.c
+++ b/ofac.c
@ -6,7 +6,10 @@
 	


-	Mark Koennecke,    November 1996
+	Mark Koennecke,    November 1996 -- ????
+
+	heavy modifications to separate PSI specific commands into a 
+	separate library. Mark Koennecke, June 2003 

 	Copyright:

@ -60,12 +63,10 @@
 #include "selvar.h"
 #include "countdriv.h"
 #include "counter.h"
-#include "buffer.h"
 #include "scan.h"
 #include "script.h"
 #include "o2t.h"
 #include "alias.h"
-#include "dmc.h"
 #include "stringdict.h"
 #include "HistMem.h"
 #include "velo.h"
@ -76,44 +77,30 @@
 #include "scan.h"
 #include "fitcenter.h"
 #include "token.h"
-#include "serial.h"
 #include "hkl.h"
 #include "optimise.h"
-#include "nextrics.h"
 #include "mesure.h"
 #include "commandlog.h"
-#include "sps.h"
 #include "udpquieck.h"
-#include "pimotor.h"
-#include "sanswave.h"
-#include "faverage.h"
-#include "fowrite.h"
 #include "choco.h"
 #include "chadapter.h"
 #include "hklscan.h"
 #include "xytable.h"
-#include "amor2t.h"
-#include "nxamor.h"
-#include "amorstat.h"
 #include "maximize.h"
 #include "difrac.h"
 #include "sicscron.h"
 #include "lin2ang.h"
-#include "tas.h"
 #include "synchronize.h"
 #include "definealias.h"
-#include "swmotor.h"
 #include "hmcontrol.h"
 #include "rs232controller.h"
 #include "lomax.h"
-#include "polterwrite.h"
 #include "anticollider.h"
 #include "gpibcontroller.h"
-#include "ecb.h"
 #include "nxscript.h"
-#include "frame.h"
 #include "tclintimpl.h"
 #include "sicsdata.h"
+#include "site.h"
 /*----------------------- Server options creation -------------------------*/
  static int IFServerOption(SConnection *pCon, SicsInterp *pSics, void *pData,
                     int argc, char *argv[])
@ -186,14 +173,12 @@
       DeleteTokenList(pList);
       return 1;
  } 
-/*-------------------------------------------------------------------------*/
-  int InitSANS(SConnection *pCon, SicsInterp *pSics, void *pData, 
-               int argc, char *argv[]); 
 /*--------------------------------------------------------------------------*/                   
  static void InitIniCommands(SicsInterp *pInter,pTaskMan pTask)
  {
    pExeList pExe;
    pEnvMon pEnv = NULL;
+    pSite site = NULL;
    assert(pInter);
    
    pExe = CreateExeList(pTask);
@ -257,57 +242,45 @@
    AddCommand(pInter,"MakeWaveLength",MakeWaveLengthVar,NULL,NULL);
    AddCommand(pInter,"MakeEnergy",MakeEnergyVar,NULL,NULL);
    AddCommand(pInter,"MakeCounter",MakeCounter,NULL,NULL);
-    AddCommand(pInter,"MakeRuenBuffer",InitBufferSys,NULL,NULL);
    AddCommand(pInter,"MakeO2T",CreateO2T,NULL,NULL);
    AddCommand(pInter,"SicsAlias",SicsAlias,NULL,NULL);
    AddCommand(pInter,"DefineAlias",DefineAlias,NULL,NULL); /* M.Z. */
-    AddCommand(pInter,"InitDMC",InitDmc,NULL,NULL);
-    AddCommand(pInter,"InitSANS",InitSANS,NULL,NULL);
    AddCommand(pInter,"MakeHM",MakeHistMemory,NULL,NULL);
    AddCommand(pInter,"VelocitySelector",VelSelFactory,NULL,NULL);
    AddCommand(pInter,"MakeDataNumber",DNFactory,NULL,NULL);
    AddCommand(pInter,"MakeScanCommand",ScanFactory,NULL,NULL);
    AddCommand(pInter,"MakePeakCenter",FitFactory,NULL,NULL);
-    AddCommand(pInter,"SerialInit",SerialInit,NULL,NULL);
    AddCommand(pInter,"MakeHKL",HKLFactory,NULL,NULL);
    AddCommand(pInter,"MakeOptimise",MakeOptimiser,NULL,NULL);
-    AddCommand(pInter,"MakeTRICSNEXUS",NexTricsFactory,NULL,NULL);
    AddCommand(pInter,"MakeMesure",MesureFactory,NULL,NULL);
-    AddCommand(pInter,"MakeSPS",SPSFactory,NULL,NULL);
-    AddCommand(pInter,"MakePIMotor",PIMotorFactory,NULL,NULL);
-    AddCommand(pInter,"MakeSANSWave",MakeSANSWave,NULL,NULL);
-    AddCommand(pInter,"MakeFocusAverager",MakeFA,NULL,NULL);
    AddCommand(pInter,"kill_command",SICSKill,NULL,NULL);
-    AddCommand(pInter,"FocusInstall",FoInstall,NULL,NULL);
    AddCommand(pInter,"MakeChopper",ChocoFactory,NULL,NULL);
    AddCommand(pInter,"ChopperAdapter",CHAdapterFactory,NULL,NULL);
    AddCommand(pInter,"MakeHklscan",HklscanFactory,NULL,NULL);
    AddCommand(pInter,"MakeXYTable",XYFactory,NULL,NULL);
-    AddCommand(pInter,"MakeAmor2T",Amor2TFactory,NULL,NULL);
-    AddCommand(pInter,"MakeStoreAmor",AmorStoreMake,NULL,NULL);
-    AddCommand(pInter,"MakeAmorStatus",AmorStatusFactory,NULL,NULL);
    AddCommand(pInter,"MakeMaximize",MaximizeFactory,NULL,NULL);
-/*
-    AddCommand(pInter,"MakeDifrac",MakeDifrac,NULL,NULL);
-*/
    AddCommand(pInter,"MakeLin2Ang",MakeLin2Ang,NULL,NULL);
-    AddCommand(pInter,"MakeTAS",TASFactory,NULL,NULL);
    AddCommand(pInter,"MakeSync",MakeSync,NULL,NULL);
-    AddCommand(pInter,"MakeSWMotor",MakeSWMotor,NULL,NULL);
    AddCommand(pInter,"MakeHMControl",MakeHMControl,NULL,NULL);
    AddCommand(pInter,"MakeRS232Controller",RS232Factory,NULL,NULL);
    AddCommand(pInter,"MakeMaxDetector",LoMaxFactory,NULL,NULL);
-    AddCommand(pInter,"PolterInstall",PolterInstall,NULL,NULL);
    AddCommand(pInter,"AntiCollisionInstall",AntiColliderFactory,NULL,NULL);
    AddCommand(pInter,"MakeGPIB",MakeGPIB,NULL,NULL);
-    AddCommand(pInter,"MakeECB",MakeECB,NULL,NULL);
    AddCommand(pInter,"MakeNXScript",MakeNXScript,NULL,NULL);
-    AddCommand(pInter,"MakePSDFrame",MakeFrameFunc,NULL,NULL);
    AddCommand(pInter,"MakeTclInt",MakeTclInt,NULL,NULL);
+
+    /*
+      install site specific commands
+    */
+    site = getSite();
+    if(site != NULL){
+      site->AddSiteCommands(pInter);
+    }
  } 
 /*---------------------------------------------------------------------------*/
  static  void KillIniCommands(SicsInterp *pSics)
  {
+    pSite site = NULL;
  
    /* specify superfluous initialization commands here */
    RemoveCommand(pSics,"TokenInit");
@ -327,48 +300,36 @@
    RemoveCommand(pSics,"MakeScan");
    RemoveCommand(pSics,"MakeO2T");
    RemoveCommand(pSics,"SicsAlias");
-    RemoveCommand(pSics,"InitDMC");
-    RemoveCommand(pSics,"InitSANS");
    RemoveCommand(pSics,"MakeHM");
    RemoveCommand(pSics,"VelocitySelector");
    RemoveCommand(pSics,"MakeDataNumber");
    RemoveCommand(pSics,"MakeScanCommand");
    RemoveCommand(pSics,"MakePeakCenter");
-    RemoveCommand(pSics,"SerialInit");
    RemoveCommand(pSics,"MakeHKL");
    RemoveCommand(pSics,"MakeOptimiser");
-    RemoveCommand(pSics,"MakeTRICSNEXUS");
    RemoveCommand(pSics,"MakeMesure");
-    RemoveCommand(pSics,"MakeSPS");
-    RemoveCommand(pSics,"MakePIMotor");
-    RemoveCommand(pSics,"MakeSANSWave");
-    RemoveCommand(pSics,"MakeFocusAverager");
-    RemoveCommand(pSics,"FocusInstall");
    RemoveCommand(pSics,"MakeChopper");
    RemoveCommand(pSics,"ChopperAdapter");
    RemoveCommand(pSics,"MakeHklscan");
    RemoveCommand(pSics,"MakeXYTable");
-    RemoveCommand(pSics,"MakeAmor2T");
-    RemoveCommand(pSics,"MakeStoreAmor");
-    RemoveCommand(pSics,"MakeAmorStatus");
    RemoveCommand(pSics,"MakeMaximize");
-/*
-    RemoveCommand(pSics,"MakeDifrac");
-*/
    RemoveCommand(pSics,"MakeLin2Ang");
-    RemoveCommand(pSics,"MakeTAS");
    RemoveCommand(pSics,"MakeSync");
-    RemoveCommand(pSics,"MakeSWMotor");
    RemoveCommand(pSics,"MakeHMControl");
    RemoveCommand(pSics,"MakeRS232Controller");
    RemoveCommand(pSics,"MakeMaxDetector");
-    RemoveCommand(pSics,"PolterInstall");
    RemoveCommand(pSics,"AntiColliderInstall");
    RemoveCommand(pSics,"MakeGPIB");
-    RemoveCommand(pSics,"MakeECB");
    RemoveCommand(pSics,"MakeNXScript");
-    RemoveCommand(pSics,"MakePSDFrame");
    RemoveCommand(pSics,"MakeTclInt");
+
+    /*
+      remove site specific installation commands
+    */
+    site = getSite();
+    if(site != NULL){
+      site->RemoveSiteCommands(pSics);
+    }
  }