- Fix for SANS

This commit is contained in:
cvs
2002-11-13 07:47:17 +00:00
parent 3ace74d9d7
commit 995484cc44
8 changed files with 479 additions and 31 deletions

View File

@@ -814,20 +814,6 @@
We have a valid PSD packet. Find and check positions.
*/
/*
old style calculation, left in for now
xPos = xData.ui2[1];
if(xPos > 32767)
xPos -= 65536;
yPos = yData.ui2[1];
if(yPos > 32767)
yPos -= 65536;
xPos = (int) ( (float)(xPos+xOff)/(float)psdXFactor);
yPos = (int)( (float)(yPos+yOff)/(float)psdYFactor);
*/
/*
This is the new version where all values are offset by 4096
@@ -894,8 +880,17 @@
}
if(middl >= Tof_edges[0]->n_bins){
middl = Tof_edges[0]->n_bins-1;
printf("WARNING: Fixed bad time bin!\n");
if(Tof_edges[0]->n_bins < 5){
/*
fix for PSD without TOF
*/
middl = Tof_edges[0]->n_bins-1;
} else {
/*
skip it, out of range
*/
continue;
}
}
/*
@@ -1263,6 +1258,20 @@
Lwl_fifo = (uint *) 0x80810080; /* for MVME1603 boards */
#endif
/*
For the MEN board the pci-to-pci bridge to the mezzanine card
has to be configured...........
*/
#ifdef MEN_A012
printf("Configuring for MEN....\n");
Lwl_fifo = (uint *) 0x8a200000;
pciConfigOutWord(0,0x1d,0,0x04,0x0007);
pciConfigOutWord(0,0x1d,0,0x20,0x8a20);
pciConfigOutWord(0,0x1d,0,0x22,0x8a20);
#endif
printf("Value at lwl_fifo = %x, address = %x\n", *Lwl_fifo, Lwl_fifo);
Lwl_csr = &Lwl_dummy_csr; /* Set up address of dummy CSR */
/*============================================================================
** Define our signal mask first and define an action routine to catch
@@ -1384,3 +1393,4 @@