Updated alias and samenv docs (M.Z.)

doc/manager/alias.htm

@@ -20,22 +20,28 @@ access internal SICS interfaces like the drive command or
 others. Object aliases are installed into SICS with the SICSAlias
 command:
 <DL>
-<DT>SicsAlias newname oldname
+<DT>SicsAlias oldname newname
 <DD>This command installs newname as alias for the object oldname.
 </dl> 
 SicsAlias can only be used within initialization scripts. SicsAlias is 
- considrered deprecated and can be replaced with the superior runtime 
+ considered deprecated and can be replaced with the superior runtime 
  aliases described below.
 </p>
 <h2>Runtime Aliases</h2>
 <p>
 Runtime aliases are full object aliases which can be configured into the
- system at run time by a SICS manager. The syntax looks like this:
+ system at run time by a SICS manager.
+The syntax looks like this:
 <dl>
-<dt>definealias SICSobject aliasname
+<dt>DefineAlias aliasname SICSobject
 <dd>This defines aliasname to be the alias for the SICS object SICSobject.
-<dt>definealias aliasname
+ It is not needed that SICSobject already exists. If SICSobject is already
-<dd>This command deltes the alias aliasname.
+ an alias, it is translated before definition.
+ Multiple translation is possible, depending on the order of definition.
+ When an alias is used, and it does not point to an existing object,
+ the behaviour is the same as if an unknown object would have been used.
+<dt>DefineAlias aliasname
+<dd>This command deletes the alias aliasname.
 </dl> 
 </p>
 <h2>Command Aliases</h2>

doc/user/samenv.htm

@@ -18,10 +18,10 @@ devices.
 <li><a href="#lsc">LakeShore Model 340</a> temperature controllers.
 <li>Oxford Instruments <a href="#itc4">ITC-4</a> or ITC-503 temperature
 controllers.
-<li><a href="#dilu">Dilution</a> Cryostat.
+<li>Old <a href="#dilu">Dilution</a> Cryostat (obsolete).
 <li>Haake <a href="#haake">waterbath </a> thermostat.
-<li><a href="#ltc11">The CryoFurnace</a> with its Neocera LTC-11 temperature
+<li>The <a href="#ltc11">Neocera LTC-11</a> temperature
-controller.
+controller (obsolete, was used for the Cryofurnace).
 <li><a href="#euro">Eurotherm Temperature Controller</a>.
 <li><a href="#bruker">Bruker</a> Magnet Controller. 
 <li>The Risoe <a href="#a1931">A1931</a> Temperature Controller.
@@ -190,6 +190,15 @@ handling is set. Valid values are:
 <DT>SafeValue
 <DD> The value to drive the controller to when an error has been detected and 
 Safe error handling is set.
+<DT>MaxWait
+<DD> Maximal time in minutes to wait in a drive temperature command.
+If maxwait is set to 0: If the temperature is not reached within tolerance,
+it waits indefinitely.
+<DT>Settle
+<DD> Wait time [minutes] after reaching temperature. Indicates how long to wait
+after reaching temperature. If the temperatures goes again out
+of tolerance during the settling time, the time outside tolerance
+is not taken into account.
 </DL>
 </p>
 <P>
@@ -263,41 +272,24 @@ that special device. All of the general commands listed above work as well!
 This is <i>the</i> temperature controller for cryogenic applications and
 should replace at least the Oxford & Neocera controllers at SINQ.<p>
 The control is handled by a seperate server process TECS (TEmperature
-Control Server) and is initialized by default. If there is already an other
+Control Server) and is initialized by default on most instruments. If there is already an other
-device selected, it must be deleted and TECS must be reinstalled:
+device selected, it must be deleted with:
 <BLOCKQUOTE>
-EVFactory del temperature<br>
+EVFactory del temperature
-EVFactory new temperature tecs
 </BLOCKQUOTE>
-The sample environment device is selected automatically by a coding in the
+and TECS must be reinstalled with:
-plug of the sensor/heater cable(s). If this does not work (plugs without
-coding or temporarely use of a wrong cable) you may select the device
-with
 <BLOCKQUOTE>
-temperature device <i>device</i>
+tecs on
 </BLOCKQUOTE>
-You may want to verify the selected device with
+(This is just an abbreavation for EVFactory new temperature tecs)<p>
-<BLOCKQUOTE>
+More details can be found on the <a href=http://sinq.web.psi.ch/sinq/sample_env/tecs.html>Sample Environment Home Page</a>
-temperature device
-</BLOCKQUOTE>
-The actually known devices (April 2000) are:
-<UL>
-<LI>orange cryostats: <b>ill1</b> (50mm), <b>ill2</b> (70mm),
-<b>ill3</b> (cryofurnace), <b>ill4</b> (FOCUS), <b>ill5</b> (100 mm)
-<LI>closed cycles: <b>cti1</b>, <b>cti2</b>, <b>cti3</b>, <b>cti4</b>,
-<b>cti5</b> (maxi), <b>cti6</b> (FOCUS), <b>apd</b> (TriCS), <b>ccr4k</b> (4K)
-<LI>other: <b>hef4c</b> (He-flow cryostat 4circle), <b>sup4t</b> (4 T supraconducting magnet)
-</UL>
 <p>
 <h3><a name="itc4">ITC-4</a> and ITC-503 Temperature Controllers</h3>
 <p>
 These temperature controller were fairly popular at SINQ. They are
 manufactured by
 Oxford Instruments. At the back of this controller is a RS-232
-socket which must be connected to a Macintosh computer running the SINQ 
+socket which must be connected to a terminal server via a serial cable.
-terminal server program via a serial cable. Please make sure with a different
-Macintosh or a PC that the serial line is OK and the ITC-4 responding before
-plugging it in.
 </p>
 <h4>ITC-4 Initialisation</h4>
 <p>
@@ -306,14 +298,12 @@ An ITC-4 can be configured into the system by:
 EVFactory new Temp ITC4 computer port channel
 </BLOCKQUOTE>
 This creates an ITC-4 controller object named Temp within the system. The
-ITC-4 is expected to be connected to the serial port channel at the 
+ITC-4 is expected to be connected to the serial port channel of the serial
-Macintosh computer computer running the SINQ terminal server program 
+port server porgramm at localhost listening at the specified port. For example:
-listening at port port. For example:
 <BLOCKQUOTE>
-EVFactory new Temp ITC4 lnsp22.psi.ch 4000 7
+EVFactory new Temp ITC4 localhost 4000 7
 </BLOCKQUOTE>
-connects Temp to the Macintosh named lnsp22, serial port 6 
+connects Temp to the serial port 7, listening at port 4000.
-(7 above is no typo!), listening at port 4000.
 </P>
 <h4>ITC-4 Additional Parameters</h4>
 <p>
@@ -322,7 +312,7 @@ The ITC-4 has a few more parameter commands:
 <DT>timeout
 <DD>Is the timeout for the Macintosh terminal server program waiting for
 responses from the ITC-4. Increase this parameter if error messages
-containg ?TMO appear. 
+contaning ?TMO appear.
 <DT> sensor
 <DD> Sets the sensor number to be used for reading temperature.
 <DT> control
@@ -341,17 +331,17 @@ the comma.
 <h4>Installing an ITC4 step by step</h4>
 <p>
 <ol>
-<li>Connect the ITC temperature controller to port 6 on the Macintosh 
+<li>Connect the ITC temperature controller to port 7 on the terminal server
-serial port extension box. Port 6 is specially configured for dealing with
+box. Port 7 is specially configured for dealing with
 the ideosyncracies of that device. No null modem is needed.
 <li>Install the ITC4 into SICS with the command: <br>
-evfactory new name Macintoshname 4000 7<br>
+evfactory new temperature localhost 4000 7<br>
-Thereby replace name with the name you want to address the ITC4 in SICS. A
+You may choose an other name than "temperature", but then it is in general not stored
-good choice for a name  is temperature, as such a value will be written to data files.
+in the data file.
 Please note, that SICS won't let you use that name if it already exists. For
 instance if you already had a controller in there. Then the command:<br>
 evfactory del name <br>
-will help. Macintoshname is the name of the instrument Macintosh PC.
+will help.
 <li>Configure the upper and lowerlimits for your controller appropriatetly.
 <li>Figure out which sensor you are going to use for reading temperatures.
 Configure the sensor and the divisor parameter accordingly.
@@ -373,7 +363,7 @@ current one.
 <h4>ITC-4 Trouble Shooting</h4>
 <p>
 If the ITC-4 <b>does not respond at all</b>, make sure the serial connection to
-the Macintosh is working. Use standard RS-232 debugging procedures for doing
+is working. Use standard RS-232 debugging procedures for doing
 this. The not responding message  may also come up as a failure to
 connect 
 to the ITC-4 during startup.
@@ -452,7 +442,7 @@ temperature sensor val
 </BLOCKQUOTE>
 val can be either intern or extern. 
 </p>
-<h3><a name="dilu">Dilution</a> Cryostat</h3>
+<h3><a name="dilu">Old Dilution</a> Cryostat (Obsolete)</h3>
 <p>
 This is a large ancient device for reaching very low temperatures. This
 cryostat can be configured into SICS with the command:
@@ -540,7 +530,7 @@ a magnetic field. This is so in order to support SICS  control logic.
 You can read values at all times explicitly using magnet current or 
 magnet field.
 </p>
-<h3><a name="ltc11">The CryoFurnace.</a></h3>
+<h3><a name="ltc11">Old CryoFurnace Controller (Obsolete)</a></h3>
 <p>
 The CryoFurnace at PSI is equipped with a Neocera LTC-11 temperature
 controller. This controller can control either an heater or an analag output