Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 240 → Rev 241

/cvi/RedPitaya/soccli/soccli.c
131,7 → 131,7
GetCtrlVal(panelHandle,PANEL_MAXX_1, &max);
 
H1D_Init(1, "ADC ch 1","Pulse height", nch, min, max );
H1D_SetTitleX(1,"ADC (a.u.)");
H1D_SetTitleX(1,"ADC (V)");
H1D_SetTitleY(1,"N");
 
GetCtrlVal(panelHandle,PANEL_NCH_2, &nch);
139,7 → 139,7
GetCtrlVal(panelHandle,PANEL_MAXX_2, &max);
 
H1D_Init(2, "ADC ch 2","Pulse height", nch, min, max );
H1D_SetTitleX(2,"ADC (a.u.)");
H1D_SetTitleX(2,"ADC (V)");
H1D_SetTitleY(2,"N");
 
GetCtrlVal(panelHandle,PANEL_NCH_3, &nch);
147,7 → 147,7
GetCtrlVal(panelHandle,PANEL_MAXX_3, &max);
 
H1D_Init(3, "TDC ch 1","TDC", nch, min, max );
H1D_SetTitleX(3,"TDC (a.u.)");
H1D_SetTitleX(3,"TDC (us)");
H1D_SetTitleY(3,"N");
 
GetCtrlVal(panelHandle,PANEL_NCH_4, &nch);
155,13 → 155,25
GetCtrlVal(panelHandle,PANEL_MAXX_4, &max);
 
H1D_Init(4, "TDC ch 2","TDC", nch, min, max );
H1D_SetTitleX(4,"TDC (a.u.)");
H1D_SetTitleX(4,"TDC (us)");
H1D_SetTitleY(4,"N");
SetCtrlAttribute (panelHandle, PANEL_ADC1, ATTR_XNAME, H1D_GetTitleX(1) );
SetCtrlAttribute (panelHandle, PANEL_ADC1, ATTR_YNAME, H1D_GetTitleY(1) );
SetCtrlAttribute (panelHandle, PANEL_ADC2, ATTR_XNAME, H1D_GetTitleX(2) );
SetCtrlAttribute (panelHandle, PANEL_ADC2, ATTR_YNAME, H1D_GetTitleY(2) );
SetCtrlAttribute (panelHandle, PANEL_TDC1, ATTR_XNAME, H1D_GetTitleX(3) );
SetCtrlAttribute (panelHandle, PANEL_TDC1, ATTR_YNAME, H1D_GetTitleY(3) );
SetCtrlAttribute (panelHandle, PANEL_TDC2, ATTR_XNAME, H1D_GetTitleX(4) );
SetCtrlAttribute (panelHandle, PANEL_TDC2, ATTR_YNAME, H1D_GetTitleY(4) );
GetCtrlVal(panelHandle,PANEL_MINX_5, &min);
GetCtrlVal(panelHandle,PANEL_MAXX_5, &max);
SetAxisScalingMode (panelHandle, PANEL_GRAPH, VAL_LEFT_YAXIS, VAL_MANUAL, min, max);
SetCtrlAttribute (panelHandle, PANEL_GRAPH, ATTR_LABEL_TEXT , "sampling adc data");
SetCtrlAttribute (panelHandle, PANEL_GRAPH, ATTR_XNAME, "t(us)" );
SetCtrlAttribute (panelHandle, PANEL_GRAPH, ATTR_YNAME, "U(V)" );
return 0;
}
 
199,10 → 211,7
if ( nsamples>0 && neve % pfreq == 0) {
const int col[4]= {VAL_RED,VAL_GREEN,VAL_BLUE,VAL_WHITE};
if (plothandle[id]) DeleteGraphPlot (panelHandle, PANEL_GRAPH, plothandle[id], VAL_IMMEDIATE_DRAW);
//float fdata[nsamples];
//for (int k=0;k<nsamples;k++) fdata[k] = *(float *) (data+k);
//printf("data0 %f %d\n", fdata[0], data[0]);
plothandle[id] = PlotXY (panelHandle, PANEL_GRAPH, timebins, fdata, nsamples, VAL_FLOAT, VAL_FLOAT, VAL_THIN_LINE, VAL_NO_POINT, VAL_SOLID, 1, col[id]);
 
//plothandle[id] = PlotXY (panelHandle, PANEL_GRAPH, timebins, data, nsamples, VAL_FLOAT, VAL_INTEGER, VAL_THIN_LINE, VAL_NO_POINT, VAL_SOLID, 1, col[id]);
220,7 → 229,6
if (fdata[k] < adcdata) adcdata = fdata[k];
if (fdata[k]< athreshold && fdata[k-1]> athreshold) {
double t0= timebins[k-1]+(athreshold-fdata[k-1])/(fdata[k]-fdata[k-1])* (timebins[k]-timebins[k-1]);
//printf("TDC = %f\n", t0);
H1D_Fill(3+id, t0,1);
}
}
255,7 → 263,7
case TCP_DISCONNECT:
printf("TCP_DISCONNECT ErrorString %s\n",GetTCPErrorString(errCode));
printf("TCP_DISCONNECT SystemErrorString %s\n",GetTCPSystemErrorString());
//DisconnectFromTCPServer (&chandle);
 
chandle = 0;
break;
case TCP_DATAREADY: {
334,7 → 342,7
GetCtrlVal(panel,PANEL_FILENAME, filename);
delay= MINTRGDELAY + nsamples - nbefore + 1;
//delay= nsamples - NBEFORE + 1;
mask = 0;
for (int i=0; i<2; i++) {
if (imask[i]) mask |= (1<<i);