| 5,7 → 5,7 |
|---|
| // Options->CompilerDefines (dodaj /DSISVME ali /DWIENVME) |
| #ifdef USE_DAQ |
| # define USE_CAMAC |
| # include "c:\HOME\dino\l2d\include\camac.h" |
| # include "c:\HOME\dino\sipmScan\include\camac.h" |
| # ifdef SISVME |
| # include "sisvme_dll.h" |
| # endif |
| 25,7 → 25,7 |
|---|
| #include <utility.h> |
| #include <analysis.h> |
| |
| #include "c:\HOME\dino\l2d\include\sipmScan_ui.h" |
| #include "c:\HOME\dino\sipmScan\include\sipmScan_ui.h" |
| |
| #ifdef USE_DAQ |
| # define USE_CAMAC |
| 246,12 → 246,11 |
|---|
| posrec.xset = runrec.x0 + posrec.ix*runrec.dx; |
| #ifdef USE_MIKRO |
| do { |
| //printf("MIKRO_MoveTo (1, x);%d\n",posrec.xset); |
| if (print) printf("MIKRO_MoveTo (1, x);%d\n",posrec.xset); |
| MIKRO_MoveTo (MIKRO_X, posrec.xset); |
| MIKRO_GetPosition(MIKRO_X, &mikroX); |
| printf("%d\n", abs(posrec.xset - mikroX)); |
| if (print) printf("%d\n", abs(posrec.xset - mikroX)); |
| } while (abs(posrec.xset - mikroX) > STEP_TOLERANCE); |
| // printf("->MIKRO_MoveTo (1, x);%d\n",posrec.xset); |
| #endif |
| posrec.xset = mikroX; // true value |
| SetCtrlVal (p1h, P1_X, posrec.xset); |
| 259,12 → 258,13 |
|---|
| for (posrec.iy=0; posrec.iy<runrec.ny; posrec.iy++) { |
| posrec.yset = runrec.y0 + posrec.iy*runrec.dy; |
| #ifdef USE_MIKRO_Y |
| //printf("MIKRO_MoveTo (2, y);%d\n",y); |
| if (print) printf("MIKRO_MoveTo (2, y);%d\n",posrec.yset); |
| do { |
| MIKRO_MoveTo (MIKRO_Y, posrec.yset); |
| MIKRO_GetPosition(MIKRO_Y, &mikroY); |
| if (print) printf("%d\n", abs(posrec.yset - mikroY)); |
| } while (abs(posrec.yset - mikroY) > STEP_TOLERANCE); |
| // printf("->MIKRO_MoveTo (2, y);%d\n",posrec.yset); |
| if (print) printf("->MIKRO_MoveTo (2, y);%d\n",posrec.yset); |
| #endif |
| posrec.yset = mikroY; |
| SetCtrlVal (p1h, P1_Y, posrec.yset); |