Subversion Repositories f9daq

Compare Revisions

No changes between revisions

Ignore whitespace Rev 203 → 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);
}
}
/cvi/instr/DRS/drs4.cws
54,12 → 54,12
[File 0002]
Path = "/c/home/dania/mcppmt/drs/TwoGaussian.C"
File Type = "CSource"
Disk Date = 3566801135
Disk Date = 3567499943
In Projects = ""
Window Top = 33
Window Left = 10
Window Z-Order = 8
Source Window State = "1,5,5,5,19,20,19,0,3,80,0,0,0,0,0,25,0,0,5,20,349,683,1,0,"
Window Z-Order = 3
Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,22,0,36,26,349,683,1,0,"
 
[File 0003]
Path = "/c/home/rok/DRS/drs4.uir"
70,35 → 70,29
Window Left = 49
Window Height = 349
Window Width = 811
Window Z-Order = 4
Window Z-Order = 2
 
[File 0004]
Path = "/c/home/rok/DRS/drs4.c"
File Type = "CSource"
Disk Date = 3566812196
Disk Date = 3567674209
In Projects = "1,"
Window Top = 522
Window Top = 396
Window Left = 247
Window Z-Order = 1
Source Window State = "1,128,128,128,10,14,14,0,0,170,0,3,0,3,0,39,109,0,128,4,349,683,1,0,"
Source Window State = "1,289,289,289,13,19,13,0,3,170,0,3,0,3,0,53,250,0,289,19,349,683,1,0,"
 
[File 0005]
Path = "/c/home/rok/DRS/drsread.lib"
File Type = "Library"
Disk Date = 3566804135
In Projects = "1,"
 
[File 0006]
Path = "/c/home/cvi/instr/MIKRO/MIKRO.c"
File Type = "CSource"
Disk Date = 3555477334
In Projects = ""
Window Top = 405
Window Top = 396
Window Left = 202
Window Z-Order = 6
Window Z-Order = 5
Source Window State = "1,367,368,368,0,0,0,0,3,80,0,0,0,0,0,25,339,0,367,20,349,683,1,0,"
 
[File 0007]
[File 0006]
Path = "/c/home/cvi/instr/MIKRO/MIKRO_ui.uir"
File Type = "User Interface Resource"
Disk Date = 3558584602
107,9 → 101,9
Window Left = 90
Window Height = 349
Window Width = 683
Window Z-Order = 7
Window Z-Order = 4
 
[File 0008]
[File 0007]
Path = "/c/home/rok/DRS/drs4.h"
File Type = "Include"
Disk Date = 3566811790
116,10 → 110,10
In Projects = ""
Window Top = 157
Window Left = 74
Window Z-Order = 5
Window Z-Order = 6
Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,62,0,75,17,349,683,1,0,"
 
[File 0009]
[File 0008]
Path = "/c/home/git/arich/daq/sa02_daq/cvi/sa02_CVI.c"
File Type = "CSource"
Disk Date = 3556593867
126,10 → 120,10
In Projects = ""
Window Top = 188
Window Left = 90
Window Z-Order = 3
Window Z-Order = 7
Source Window State = "1,4397,4397,4397,10,89,10,0,3,80,0,0,0,0,0,25,4378,0,4397,89,349,683,1,0,"
 
[File 0010]
[File 0009]
Path = "/c/home/git/arich/daq/sa02_daq/sa02lib.c"
File Type = "CSource"
Disk Date = 3556593867
136,9 → 130,15
In Projects = ""
Window Top = 33
Window Left = 10
Window Z-Order = 2
Window Z-Order = 8
Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,26,39,349,683,1,0,"
 
[File 0010]
Path = "/c/home/rok/DRS/drsread.lib"
File Type = "Library"
Disk Date = 3567673573
In Projects = "1,"
 
[Tab Order]
Tab 0001 = "/c/home/dania/mcppmt/drs/TwoGaussian.C"
Tab 0002 = "/c/home/rok/DRS/drs4.uir"
/cvi/instr/DRS/drsread.cpp
296,10 → 296,11
gettimeofday(&mtime, NULL);
if (m_evSerial == 0) {
memcpy(p, "DRS2", 4); // File identifier and version
p += 4;
// time calibration header
memcpy(p, "TIME", 4);
memcpy(p, "TIME", 4);
p += 4;
 
for (int b=0 ; b<m_nBoards ; b++) {
// store board serial number
sprintf((char *)p, "B#");
369,6 → 370,9
if (DRSParameters->mask & (0x1<<i)) {
sprintf((char *)p, "C%03d", i+1);
p += 4;
unsigned int s = drs->GetBoard(b)->GetScaler(i);
memcpy(p, &s, sizeof(int));
p += sizeof(int);
for (int j=0 ; j<m_waveDepth ; j++) {
// save binary date as 16-bit value:
// 0 = -0.5V, 65535 = +0.5V for range 0
617,4 → 621,4
}
 
#endif
#endif
/cvi/instr/DRS/drsread.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/cvi/instr/DRS/drsread.lib
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream