- Fixes to HM code for AMOR TOF

- A couple of TAS fixes
- o2t was fixed to work with any drivable
- FOCUS was mended to include beam monitor in data file

macro.c

@@ -182,10 +182,17 @@ extern Tcl_Interp *InterpGetTcl(SicsInterp *pSics);
      SCsetMacro(pCon,1);
      iRet = pCommand->OFunc(pCon,pSinter,pCommand->pData,margc, myarg);
      SCsetMacro(pCon,iMacro);
-     
-     free(pSics->lastUnknown[pSics->iStack]);      
-     pSics->lastUnknown[pSics->iStack] = NULL;     
-     
+
+     /*
+       lastUnkown gets deeply stacked with each SICS command exec'd.
+       This is not reflected in code. However, lastUnknown has already 
+       done its job here, so it is safe to do it the way it is done
+     */ 
+     if(pSics->lastUnknown[pSics->iStack] != NULL)
+     {
+       free(pSics->lastUnknown[pSics->iStack]);      
+       pSics->lastUnknown[pSics->iStack] = NULL;     
+     }
 
      /* finish */
      if(iRet)
@@ -375,6 +382,7 @@ extern Tcl_Interp *InterpGetTcl(SicsInterp *pSics);
        {
          sprintf(pBueffel," Failed to open file -> %s <- ",argv[1]);
          SCWrite(pCon,pBueffel,eError);
+	 /* SCSetInterrupt(pCon,eAbortBatch); */
          return 0;
        }