Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 206 → Rev 207

/cvi/instr/DRS/drs4.c
153,12 → 153,14
int buffer_size = 0;
const int nBoards=1;
const int waveDepth=1024;
 
if (buffer_size == 0) {
buffer_size = 4 + nBoards * (4 + 4*(4+waveDepth*4));
buffer_size += 24 + nBoards * (8 + 4*(4+waveDepth*2));
buffer = (unsigned char *)malloc(buffer_size);
}
 
buffer_size = 8; // file header + time header
buffer_size += nBoards * (4 + 4*(4+waveDepth*4)); // bin widths
buffer_size += 24 + nBoards * (8 + 4*(8+waveDepth*2));
buffer = (unsigned char *)malloc(buffer_size);
}
time_t t=0,told=0, tstart=0;
 
if (!DRSInit()) {
218,14 → 220,16
 
int CVICALLBACK scan(void *functionData) {
 
int dx[2];
int nx[2];
int x0[2];
int ix[2];
int dx[3]={0,0,0};
int nx[3]={0,0,0};
int x0[3]={0,0,0};
int ix[3]={0,0,0};
int idx[3]={0,0,0};
int size;
char posrec[4]="POSR";
char runbuf[4]="PRUN";
char buffer[12]="POSR";
int *n = (int *) &buffer[4];
int n[3];
char filename[0xFF];
int enabledoutput;
244,6 → 248,21
GetCtrlVal(p2, SCAN_NSTEPSY, &nx[1]);
GetCtrlVal(p2, SCAN_STARTX, &x0[0]);
GetCtrlVal(p2, SCAN_STARTY, &x0[1]);
 
if (enabledoutput) {
fp = fopen(filename,"ab");
if (fp) {
size=36;
fwrite(runbuf, 1,4 ,fp);
fwrite(&size , 1,4 ,fp);
fwrite(x0 , 1,4*3 ,fp);
fwrite(dx , 1,4*3 ,fp);
fwrite(nx , 1,4*3 ,fp);
fclose(fp);
}
}
for (int i=0; i<nx[0]; i++) {
 
ix[0]= x0[0]+i*dx[0];
263,10 → 282,17
SetCtrlVal (p2, SCAN_XP, n[0]);
MIKRO_GetPosition(2,&n[1]);
SetCtrlVal (p2, SCAN_YP, n[1]);
if (enabledoutput) {
if (enabledoutput) {
fp = fopen(filename,"ab");
if (fp) {
fwrite(buffer, 1,12 ,fp);
idx[0]=i;
idx[1]=j;
size=24;
fwrite(posrec, 1,4 ,fp);
fwrite(&size , 1,4 ,fp);
fwrite(n , 1,4*3 ,fp);
fwrite(idx , 1,4*3 ,fp);
fclose(fp);
}
}