From 9c9a2d45a5a5d9d897376599d305c779b1ae1824 Mon Sep 17 00:00:00 2001
From: cvs <cvs>
Date: Fri, 7 Apr 2000 08:39:25 +0000
Subject: [PATCH] - Added forceclear to scancom

---
 danu.dat        | 2 +-
 hkl.c           | 4 +++-
 sicsstatus.tcl  | 4 ++--
 tcl/scancom.tcl | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/danu.dat b/danu.dat
index 507524c9..989c7114 100644
--- a/danu.dat
+++ b/danu.dat
@@ -1,3 +1,3 @@
- 5437 
+ 5438 
 NEVER, EVER modify or delete this file
 You'll risk eternal damnation and a reincarnation as a cockroach!|n
\ No newline at end of file
diff --git a/hkl.c b/hkl.c
index 79649cea..dfac6932 100644
--- a/hkl.c
+++ b/hkl.c
@@ -817,7 +817,7 @@
      }
      
      /* loop till success */
-     for(i = 0, myPsi = 0.; i < iRetry; i++, myPsi += 10.); 
+     for(i = 0, myPsi = fPsi; i < iRetry; i++, myPsi += 10.)
      {
        /* just try it*/
        iRet = ICAL(self,fHKL, myPsi, iHamil, self->iQuad,fSet,fDelom);
@@ -876,6 +876,8 @@
        iTest += MotorCheckBoundary(self->pPhi,fSet[4], &fHard,pError,131);
        if(iTest == 3) /* none of them burns */
        {
+           sprintf(pBueffel,"Solution found at psi = %4.1f",myPsi);
+           SCWrite(pCon,pBueffel,eWarning);
            return 1;
        }
      }
diff --git a/sicsstatus.tcl b/sicsstatus.tcl
index ef57d68a..08219a59 100644
--- a/sicsstatus.tcl
+++ b/sicsstatus.tcl
@@ -22,8 +22,8 @@ th sign 1.000000
 th InterruptMode 0.000000
 th AccessCode 2.000000
 #Crystallographic Settings
-hkl lambda 0.703790
-hkl setub -0.124702 0.001618 -0.041357 -0.104448 -0.001326 0.049388 0.000751 0.084094 0.001574
+hkl lambda 1.178100
+hkl setub 0.217614 0.141834 -0.048542 0.151125 -0.057954 0.087584 0.070284 -0.314535 -0.038027
 det1dist 300.
 det1dist setAccess 1
 det1zeroy 128.
diff --git a/tcl/scancom.tcl b/tcl/scancom.tcl
index 2d899358..953eef6f 100644
--- a/tcl/scancom.tcl
+++ b/tcl/scancom.tcl
@@ -276,7 +276,6 @@ object_class ScanCommand {
             ClientPut "ERROR: Scan already in progress" error
             return 
      }
-     set slot(Active) 1
      xxxscan clear
      for {set i 0 } { $i < $slot(NoVar)} {incr i} {
        set ret [catch {xxxscan add [lindex $slot(scanvars) $i] \
@@ -286,6 +285,7 @@ object_class ScanCommand {
                error $msg
        }
      }
+     set slot(Active) 1
      set ret [catch \
          {xxxscan run $slot(NP) $slot(Mode) $slot(Preset)} msg]
      set slot(Active) 0
@@ -302,6 +302,10 @@ object_class ScanCommand {
        set slot(Active) 0  
        return "Scan Finished"
    }
+   
+   method forceclear {} {
+      set slot(Active) 0
+   }
 }
 #---- end of ScanCommand definition