PSI update

r1464 | ffr | 2007-02-12 12:20:21 +1100 (Mon, 12 Feb 2007) | 2 lines

mcstas/dmc/vdmccom.tcl

@@ -15,7 +15,9 @@ if { [info exists vdmcinit] == 0 } {
   Publish copydmcdata User
   Publish sample User
   Publish wwwsics Spy
+  Publish wwwfilefornumber Spy
   mcinstall
+  Publish gethm Spy
 }
 source $home/log.tcl
 source $home/nxsupport.tcl
@@ -38,12 +40,19 @@ proc washlazy {name} {
 		if { [string first "H  K  L  THETA  2THETA D VALUE" $line] > 0} {
 		    break
 		}
+#-------- A second version to treat the messed up lazy pulverix files
+# uploaded through the WWW-interface
+		if { [string first "H K L THETA" $line] >= 0} {
+		    break
+		}
     }
 #------- process data lines
     puts $out "// mult Q(hkl) F2 DW w"
+    clientput "HKL found at: $line"
     while { [gets $in line] >= 0} {
 		set num [scan $line "%d %d %d %f %f %f %f %f %d %d %d %f %f %f %f %f %d"\
 			     h k l th th2 d di sin h2 k2 l2 I F A B ang mul]
+	        clientput "Line = $num, $line"
 		if { $num == 17} {
 	    	set q [expr (2.*3.14159265358979323846)/$d]
 	    	set f2 [expr $F * $F]
@@ -155,6 +164,7 @@ proc rundmcoptsim {mode preset } {
 	} else {
 		return $msg
 	} 
+        wait 5
 } 
 #------------------------------------------------------------------------
 proc copydmcdataold { } {
@@ -363,7 +373,7 @@ proc wwwpar {type mot} {
 }
 #------------- wwwuser formats user information into a html table
 proc wwwuser {} {
-  lappend list title sample user email phone adress
+  lappend list title  user email phone adress
   append txt "<table>"
   foreach e $list {
     set ret [catch {$e} msg]
@@ -376,6 +386,14 @@ proc wwwuser {} {
   }  
   return $txt
 }
-
+#------------- wwwfilefornumber returns the path to a data file for a
+#              number
+proc wwwfilefornumber {num} {
+    return [makeSimForNum $num]
+}
+#-------------------------------------------------------------------
+proc gethm {} {
+    banana uuget 0
+}