merge and replace with PSI+site_ansto

This commit is contained in:
Douglas Clowes
2012-11-26 11:33:14 +11:00
541 changed files with 131710 additions and 82841 deletions

View File

@ -1,3 +1,3 @@
230
232
NEVER, EVER modify or delete this file
You'll risk eternal damnation and a reincarnation as a cockroach!|n

View File

@ -10,7 +10,7 @@
* %I
* Written by: Kim Lefmann
* Date: October 4, 1997
* Version: $Revision: 1.19 $
* Version: $Revision$
* Origin: Risoe
* Release: McStas 1.6
* Modified to write monitor file for SICS: Mark Koennecke, June 2005

View File

@ -10,7 +10,7 @@
* %I
* Written by: Kim Lefmann
* Date: Feb 3, 1998
* Version: $Revision: 1.2 $
* Version: $Revision$
* Origin: Risoe
* Release: McStas 1.6
*

View File

@ -30,12 +30,9 @@
*
* Usage: Automatically embbeded in the c code.
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
* $Id$
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*
@ -90,7 +87,7 @@
*******************************************************************************/
#ifndef MCSTAS_R_H
#define MCSTAS_R_H "$Revision: 1.2 $"
#define MCSTAS_R_H "$Revision$"
#include <math.h>
#include <string.h>
@ -572,12 +569,9 @@ void mcsiminfo_close(void);
*
* Usage: Automatically embbeded in the c code whenever required.
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
* $Id$
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*
@ -4362,12 +4356,9 @@ MCNUM mccDet9_zmax;
* %include "read_table-lib"
*
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
* $Id$
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*
@ -4442,12 +4433,9 @@ static void Table_Stat(t_Table *mc_rt_Table);
* Usage: within SHARE
* %include "read_table-lib"
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
* $Id$
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*
@ -5296,12 +5284,9 @@ long Virtual_input_Read_Input(char *aFile, char *aType, t_Table *aTable, long *a
* Usage: within SHARE
* %include "monitor_nd-lib"
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
* $Id$
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*
@ -5475,12 +5460,9 @@ void Monitor_nD_McDisplay(MonitornD_Defines_type *,
* Usage: within SHARE
* %include "monitor_nd-lib"
*
* $Id: dmcafter.c,v 1.2 2007-02-12 01:19:07 ffr Exp $
* $Id$
*
* $Log: not supported by cvs2svn $
* Revision 1.1.2.1 2007/02/06 04:03:21 ffr
* PSI Update
*
* $Log$
* Revision 1.1 2007/01/30 03:19:43 koennecke
* - Fixed state monitor eclipse commit problems. Siiiiiiiggggghhhhhh!
*

File diff suppressed because it is too large Load Diff

View File

@ -122,10 +122,10 @@ twothetad failafter 3.000000
twothetad maxretry 3.000000
twothetad movecount 10.000000
# Counter counter
counter SetPreset 60000.000000
counter SetPreset 6000.000000
counter SetMode Monitor
banana CountMode monitor
banana preset 60000.000000
banana preset 6000.000000
# Motor a1
a1 sign 1.000000
a1 SoftZero 0.000000
@ -257,7 +257,7 @@ comment2 UNKNOWN
comment2 setAccess 2
comment3 UNKNOWN
comment3 setAccess 2
starttime 2008-03-18 13:09:23
starttime 2008-11-17 13:02:54
starttime setAccess 2
adress 2223 Luketown, 33 Luke Drive
adress setAccess 2
@ -269,7 +269,7 @@ email Luke@luke.ch
email setAccess 2
sample_mur 0.000000
sample_mur setAccess 2
lastdatafile /afs/psi.ch/user/k/koennecke/src/workspace/sics/mcstas/dmc/000/vdmc2008n000230.xml
lastdatafile /afs/psi.ch/user/k/koennecke/src/workspace/sics/mcstas/dmc/000/vdmc2008n000232.xml
lastdatafile setAccess 2
lastscancommand unknown scan
lastscancommand setAccess 2