diff --git a/examples/moench03_T1.config b/examples/moench03_T1.config index e894211f8..775f225c1 100644 --- a/examples/moench03_T1.config +++ b/examples/moench03_T1.config @@ -18,13 +18,13 @@ udp_srcip 10.1.2.19 ############################################# ### edit with 10 Gbs IP of your server ############################################ -#rx_zmqip 10.1.1.102 -#rx_zmqport 30001 +rx_zmqip 10.1.1.102 +rx_zmqport 30001 ############################################# ### edit with 1 Gbs IP of PC where you will run the GUI ############################################ -#zmqip 129.129.202.110 -#zmqport 40001 +#zmqip 129.129.202.136 +zmqport 40001 ############################################# @@ -49,7 +49,7 @@ fwrite 0 rx_jsonpara frameMode newpedestal rx_jsonpara detectorMode analog - +rx_discardpolicy discardpartial powerchip 1 vhighvoltage 90 diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp index e30f56361..4310e2815 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp @@ -471,48 +471,19 @@ int main(int argc, char *argv[]) { // #ifndef DEVELOPER // #ifndef MOENCH_BRANCH -// zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, 0,0, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex,0 , packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, additionalJsonHeader); +// zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, 1,1, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex,0 , packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, additionalJsonHeader); // #endif // #endif // #ifdef DEVELOPER -#ifdef CTBGUI - zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader); -#endif -#ifndef CTBGUI - zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,1,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader); -#endif -// #endif -// #ifdef MOENCH_BRANCH -// /* -// int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0, -// uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0, -// uint64_t acqIndex = 0, uint64_t fIndex = 0, char* fname = NULL, -// uint64_t frameNumber = 0, uint32_t expLength = 0, uint32_t packetNumber = 0, -// uint64_t bunchId = 0, uint64_t timestamp = 0, -// uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0, -// uint32_t debug = 0, uint16_t roundRNumber = 0, -// uint8_t detType = 0, uint8_t version = 0, int* flippedData = 0, -// char* additionalJsonHeader = 0) { -// int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEADER_VERSION , uint32_t dr, uint64_t fileindex, uint32_t 0, uint32_t 0, uint32_t, uint64_t, uint64_t, char*, uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, int*, char*) - -// */ -// //zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version);//, 0,additionalJsonHeader); -// zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader); - -// /* old -// zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader); -// */ -// /* - - -// new -// zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,additionalJsonHeader); -// */ -// #endif - - +// #ifdef CTBGUI +// zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader); +// #endif +// #ifndef CTBGUI + zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 1,1,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader); + //#endif + zmqsocket2->SendData((char*)dout,nnx*nny*dr/8); cprintf(GREEN, "Sent Data\n"); diff --git a/slsDetectorServers/moenchDetectorServer/DefaultPattern.txt b/slsDetectorServers/moenchDetectorServer/DefaultPattern.txt index 5cf148cc8..71851a67f 100755 --- a/slsDetectorServers/moenchDetectorServer/DefaultPattern.txt +++ b/slsDetectorServers/moenchDetectorServer/DefaultPattern.txt @@ -1,414 +1,289 @@ -patword 0x0000 0x0000000000000000 -patword 0x0001 0x0000000000000000 -patword 0x0002 0x0008000900080000 -patword 0x0003 0x0008000900080000 -patword 0x0004 0x0008000900080000 -patword 0x0005 0x0008000900080000 -patword 0x0006 0x0008000900080000 -patword 0x0007 0x0008000900080000 -patword 0x0008 0x0008000900080000 -patword 0x0009 0x0008000900080000 -patword 0x000a 0x0008000900080000 -patword 0x000b 0x0008000900080000 -patword 0x000c 0x0008000900080000 -patword 0x000d 0x0008000900080000 -patword 0x000e 0x0008000900080000 -patword 0x000f 0x0008000900080000 -patword 0x0010 0x0008000900080000 -patword 0x0011 0x0008000900080000 -patword 0x0012 0x0008000900080000 -patword 0x0013 0x0008000900080000 -patword 0x0014 0x0008000900080000 -patword 0x0015 0x0008000900080000 -patword 0x0016 0x0008400900080020 -patword 0x0017 0x0008400900080020 -patword 0x0018 0x0008599f0418503a -patword 0x0019 0x0008599f0418503a -patword 0x001a 0x0108599f0418503a -patword 0x001b 0x0108599f0418503a -patword 0x001c 0x0108599f0418503a -patword 0x001d 0x0108599f0418503a -patword 0x001e 0x0108599f0418503a -patword 0x001f 0x0108599f0418503a -patword 0x0020 0x0108599f0418503a -patword 0x0021 0x0108599f0418503a -patword 0x0022 0x0108599f0418503a -patword 0x0023 0x0108599f0418503a -patword 0x0024 0x0108599f0418503a -patword 0x0025 0x0108599f0418503a -patword 0x0026 0x0108599f0418503a -patword 0x0027 0x0108599f0418503a -patword 0x0028 0x0108599f0418503a -patword 0x0029 0x0108599f0418503a -patword 0x002a 0x0108599f0418503a -patword 0x002b 0x0108599f0418503a -patword 0x002c 0x0108599f0418503a -patword 0x002d 0x0108599f0418503a -patword 0x002e 0x0108599f0418503a -patword 0x002f 0x0108599f0418503a -patword 0x0030 0x0108599f0418503a -patword 0x0031 0x0108599f0418503a -patword 0x0032 0x0108599f0418503a -patword 0x0033 0x0108599f0418503a -patword 0x0034 0x0108599f0418503a -patword 0x0035 0x0108599f0418503a -patword 0x0036 0x0108599f0418503a -patword 0x0037 0x0108599f0418503a -patword 0x0038 0x0108599f0418503a -patword 0x0039 0x0108599f0418503a -patword 0x003a 0x0108599f0418503a -patword 0x003b 0x0108599f0418503a -patword 0x003c 0x0108599f0418503a -patword 0x003d 0x0108599f0418503a -patword 0x003e 0x0108599f0418503a -patword 0x003f 0x0108599f0418503a -patword 0x0040 0x0108599f0418503a -patword 0x0041 0x0108599f0418503a -patword 0x0042 0x0108599f0418503a -patword 0x0043 0x0108599f0418503a -patword 0x0044 0x0108599f0418503a -patword 0x0045 0x0108599f0418503a -patword 0x0046 0x0108599f0418503a -patword 0x0047 0x0108599f0418503a -patword 0x0048 0x0108599f0418503a -patword 0x0049 0x0108599f0418503a -patword 0x004a 0x0108599f0418503a -patword 0x004b 0x0108599f0418503a -patword 0x004c 0x0108599f0418503a -patword 0x004d 0x0108599f0418503a -patword 0x004e 0x0108599f0418503a -patword 0x004f 0x0108599f0418503a -patword 0x0050 0x0108599f0418503a -patword 0x0051 0x0108599f0418503a -patword 0x0052 0x0108599f0418503a -patword 0x0053 0x0108599f0418503a -patword 0x0054 0x0108599f0418503a -patword 0x0055 0x0108599f0418503a -patword 0x0056 0x0108599f0418503a -patword 0x0057 0x0108599f0418503a -patword 0x0058 0x0108599f0418503a -patword 0x0059 0x0108599f0418503a -patword 0x005a 0x0108599f0418503a -patword 0x005b 0x0108599f0418503a -patword 0x005c 0x0108599f0418503a -patword 0x005d 0x0108599f0418503a -patword 0x005e 0x0108599f0418503a -patword 0x005f 0x0108599f0418503a -patword 0x0060 0x0108599f0418503a -patword 0x0061 0x0108599f0418503a -patword 0x0062 0x0108599f0418503a -patword 0x0063 0x0108599f0418503a -patword 0x0064 0x0108599f0418503a -patword 0x0065 0x0108599f0418503a -patword 0x0066 0x0108599f0418503a -patword 0x0067 0x0108599f0418503a -patword 0x0068 0x0108599f0418503a -patword 0x0069 0x0108599f0418503a -patword 0x006a 0x0108599f0418503a -patword 0x006b 0x0108599f0418503a -patword 0x006c 0x0108599f0418503a -patword 0x006d 0x0108599f0418503a -patword 0x006e 0x0108599f0418503a -patword 0x006f 0x0108599f0418503a -patword 0x0070 0x0108599f0418503a -patword 0x0071 0x0108599f0418503a -patword 0x0072 0x0108599f0418503a -patword 0x0073 0x0108599f0418503a -patword 0x0074 0x0108599f0418503a -patword 0x0075 0x0108599f0418503a -patword 0x0076 0x0108599f0418503a -patword 0x0077 0x0108599f0418503a -patword 0x0078 0x0108599f0418503a -patword 0x0079 0x0108599f0418503a -patword 0x007a 0x0108599f0418503a -patword 0x007b 0x0108599f0418503a -patword 0x007c 0x0108599f0418503a -patword 0x007d 0x0108599f0418503a -patword 0x007e 0x010859960418503a -patword 0x007f 0x010859960418503a -patword 0x0080 0x010859960418503a -patword 0x0081 0x010859960418503a -patword 0x0082 0x010859960418503a -patword 0x0083 0x010859960418503a -patword 0x0084 0x010859960418503a -patword 0x0085 0x010859960418503a -patword 0x0086 0x010859960418503a -patword 0x0087 0x010859960418503a -patword 0x0088 0x010859960418503a -patword 0x0089 0x010859960418503a -patword 0x008a 0x010859960418503a -patword 0x008b 0x010859960418503a -patword 0x008c 0x010859960418503a -patword 0x008d 0x010859960418503a -patword 0x008e 0x010859960418503a -patword 0x008f 0x010859960418503a -patword 0x0090 0x010859960418503a -patword 0x0091 0x010859960418503a -patword 0x0092 0x010819960418501a -patword 0x0093 0x010819960418501a -patword 0x0094 0x010819960418501a -patword 0x0095 0x010819960418501a -patword 0x0096 0x030819960418501a -patword 0x0097 0x030819960418501a -patword 0x0098 0x030819960418501a -patword 0x0099 0x030819960418501a -patword 0x009a 0x030819960418501a -patword 0x009b 0x030819960418501a -patword 0x009c 0x030819960418501a -patword 0x009d 0x030819960418501a -patword 0x009e 0x030819960418501a -patword 0x009f 0x030819960418501a -patword 0x00a0 0x030819960418501a -patword 0x00a1 0x030819960418501a -patword 0x00a2 0x030819960418501a -patword 0x00a3 0x030819960418501a -patword 0x00a4 0x030819960418501a -patword 0x00a5 0x030819960418501a -patword 0x00a6 0x030819960418501a -patword 0x00a7 0x030819960418501a -patword 0x00a8 0x030819960418501a -patword 0x00a9 0x030819960418501a -patword 0x00aa 0x030819960418501a -patword 0x00ab 0x030819960418501a -patword 0x00ac 0x030819960008501a -patword 0x00ad 0x030819960008501a -patword 0x00ae 0x030819960008501a -patword 0x00af 0x030819960008501a -patword 0x00b0 0x030819960008501a -patword 0x00b1 0x030819960008501a -patword 0x00b2 0x030819960008501a -patword 0x00b3 0x030819960008501a -patword 0x00b4 0x030819960008501a -patword 0x00b5 0x030819960008501a -patword 0x00b6 0x030819960008501a -patword 0x00b7 0x030819960008501a -patword 0x00b8 0x030819960008501a -patword 0x00b9 0x030819960008501a -patword 0x00ba 0x030819960008501a -patword 0x00bb 0x030819960008501a -patword 0x00bc 0x030819960008501a -patword 0x00bd 0x030819960008501a -patword 0x00be 0x030819960008501a -patword 0x00bf 0x030819960008501a -patword 0x00c0 0x0308199f0008501a -patword 0x00c1 0x0308199f0008501a -patword 0x00c2 0x0308199f0008501a -patword 0x00c3 0x0308199f0008501a -patword 0x00c4 0x0308199f0008501a -patword 0x00c5 0x0308199f0008501a -patword 0x00c6 0x0308199f0008501a -patword 0x00c7 0x0308199f0008501a -patword 0x00c8 0x0308199f0008501a -patword 0x00c9 0x0308199f0008501a -patword 0x00ca 0x0308199f0008501a -patword 0x00cb 0x0308199f0008501a -patword 0x00cc 0x0308199f0008501a -patword 0x00cd 0x0308199f0008501a -patword 0x00ce 0x0308199f0008501a -patword 0x00cf 0x0308199f0008501a -patword 0x00d0 0x0308199f0008501a -patword 0x00d1 0x0308199f0008501a -patword 0x00d2 0x0308199f0008501a -patword 0x00d3 0x0308199f0008501a -patword 0x00d4 0x0308599f0008503a -patword 0x00d5 0x0308599f0008503a -patword 0x00d6 0x030c599f000850ba -patword 0x00d7 0x030c599f000850ba -patword 0x00d8 0x030c599f000850ba -patword 0x00d9 0x030c599f000850ba -patword 0x00da 0x030c599f000850ba -patword 0x00db 0x030c599f000850ba -patword 0x00dc 0x030c599f000850ba -patword 0x00dd 0x030c599f000850ba -patword 0x00de 0x030c599f000850ba -patword 0x00df 0x030c599f000850ba -patword 0x00e0 0x030c599f000850ba -patword 0x00e1 0x030c599f000850ba -patword 0x00e2 0x030c599f000850ba -patword 0x00e3 0x030c599f000850ba -patword 0x00e4 0x030c599f000850ba -patword 0x00e5 0x030c599f000850ba -patword 0x00e6 0x030c599f000850ba -patword 0x00e7 0x030c599f000850ba -patword 0x00e8 0x030c599f000850ba -patword 0x00e9 0x030c599f000850ba -patword 0x00ea 0x030c799f010858ba -patword 0x00eb 0x030c799f010858ba -patword 0x00ec 0x030c599f000850ba -patword 0x00ed 0x030c599f000850ba -patword 0x00ee 0x030c599f000850ba -patword 0x00ef 0x030c599f000850ba -patword 0x00f0 0x030c599f000850ba -patword 0x00f1 0x030c599f000850ba -patword 0x00f2 0x030c599f000850ba -patword 0x00f3 0x030c599f000850ba -patword 0x00f4 0x030c599f000850ba -patword 0x00f5 0x030c599f000850ba -patword 0x00f6 0x030c599f000850ba -patword 0x00f7 0x030c599f000850ba -patword 0x00f8 0x030c599f000850ba -patword 0x00f9 0x030c599f000850ba -patword 0x00fa 0x030c599f000850ba -patword 0x00fb 0x030c599f000850ba -patword 0x00fc 0x030c599f000850ba -patword 0x00fd 0x030c599f000850ba -patword 0x00fe 0x030c599f000850ba -patword 0x00ff 0x030c599f000850ba -patword 0x0100 0x030c599f000850ba -patword 0x0101 0x030c599f000850ba -patword 0x0102 0x030c599f400850ba -patword 0x0103 0x030c599f400850ba -patword 0x0104 0x030c599f600850ba -patword 0x0105 0x030c599f400850ba -patword 0x0106 0x030c599f400850ba -patword 0x0107 0x030c599f400850ba -patword 0x0108 0x870c599f682e50ba -patword 0x0109 0x870c599f482850ba -patword 0x010a 0x870c599f000e50ba -patword 0x010b 0x870c599f000850ba -patword 0x010c 0x870c599f000e50ba -patword 0x010d 0x870c599f000850ba -patword 0x010e 0x870c599f000e50ba -patword 0x010f 0x870c599f000850ba -patword 0x0110 0x870c599f000e50ba -patword 0x0111 0x870c599f000850ba -patword 0x0112 0x870c599f000e50ba -patword 0x0113 0x870c599f000850ba -patword 0x0114 0x870c599f000e50ba -patword 0x0115 0x870c599f000850ba -patword 0x0116 0x870c599f000e50ba -patword 0x0117 0x870c599f000850ba -patword 0x0118 0x870c599f000e50ba -patword 0x0119 0x870c599f000850ba -patword 0x011a 0x870c599f000e50ba -patword 0x011b 0x870c599f000850ba -patword 0x011c 0x870c599f000e50ba -patword 0x011d 0x870c599f000850ba -patword 0x011e 0x870c599f000e50ba -patword 0x011f 0x870c599f000850ba -patword 0x0120 0x870c599f000e50ba -patword 0x0121 0x870c599f000850ba -patword 0x0122 0x870c599f200e50ba -patword 0x0123 0x870c599f000850ba -patword 0x0124 0x870c599f000e50ba -patword 0x0125 0x870c599f000850ba -patword 0x0126 0x870c599f000e50ba -patword 0x0127 0x870c599f000850ba -patword 0x0128 0x870c599f000e50ba -patword 0x0129 0x870c599f000850ba -patword 0x012a 0x870c599f000e50ba -patword 0x012b 0x870c599f000850ba -patword 0x012c 0x870c599f000e50ba -patword 0x012d 0x870c599f000850ba -patword 0x012e 0x870c599f000e50ba -patword 0x012f 0x870c599f000850ba -patword 0x0130 0x870c599f000e50ba -patword 0x0131 0x870c599f000850ba -patword 0x0132 0x870c599f000e50ba -patword 0x0133 0x870c599f000850ba -patword 0x0134 0x870c599f000e50ba -patword 0x0135 0x870c599f000850ba -patword 0x0136 0x870c599f000e50ba -patword 0x0137 0x870c599f000850ba -patword 0x0138 0x870c599f000e50ba -patword 0x0139 0x870c599f000850ba -patword 0x013a 0x870c599f282e50ba -patword 0x013b 0x870c599f082850ba -patword 0x013c 0x870c599f000e50ba -patword 0x013d 0x870c599f000850ba -patword 0x013e 0x870c599f000e50ba -patword 0x013f 0x870c599f000850ba -patword 0x0140 0x870c599f000e50ba -patword 0x0141 0x870c599f000850ba -patword 0x0142 0x870c599f000e50ba -patword 0x0143 0x870c599f000850ba -patword 0x0144 0x870c599f000e50ba -patword 0x0145 0x870c599f000850ba -patword 0x0146 0x870c599f000e50ba -patword 0x0147 0x870c599f000850ba -patword 0x0148 0x870c599f000e50ba -patword 0x0149 0x870c599f000850ba -patword 0x014a 0x870c599f000e50ba -patword 0x014b 0x870c599f000850ba -patword 0x014c 0x870c599f000e50ba -patword 0x014d 0x870c599f000850ba -patword 0x014e 0x870c599f000e50ba -patword 0x014f 0x870c599f000850ba -patword 0x0150 0x870c599f000e50ba -patword 0x0151 0x870c599f000850ba -patword 0x0152 0x870c599f000e50ba -patword 0x0153 0x870c599f000850ba -patword 0x0154 0x870c599f200e50ba -patword 0x0155 0x870c599f000850ba -patword 0x0156 0x870c599f000e50ba -patword 0x0157 0x870c599f000850ba -patword 0x0158 0x870c599f000e50ba -patword 0x0159 0x870c599f000850ba -patword 0x015a 0x870c599f000e50ba -patword 0x015b 0x870c599f000850ba -patword 0x015c 0x870c599f000e50ba -patword 0x015d 0x870c599f000850ba -patword 0x015e 0x870c599f000e50ba -patword 0x015f 0x870c599f000850ba -patword 0x0160 0x870c599f000e50ba -patword 0x0161 0x870c599f000850ba -patword 0x0162 0x870c599f000e50ba -patword 0x0163 0x870c599f000850ba -patword 0x0164 0x870c599f000e50ba -patword 0x0165 0x870c599f000850ba -patword 0x0166 0x870c599f000e50ba -patword 0x0167 0x870c599f000850ba -patword 0x0168 0x870c599f000e50ba -patword 0x0169 0x870c599f000850ba -patword 0x016a 0x870c599f000e50ba -patword 0x016b 0x870c599f000850ba -patword 0x016c 0x070c599f000850ba -patword 0x016d 0x070c599f000850ba -patword 0x016e 0x000c599f000850ba -patword 0x016f 0x000c599f000850ba -patword 0x0170 0x0008599f200e503a -patword 0x0171 0x0008599f0008503a -patword 0x0172 0x0008599f200e503a -patword 0x0173 0x0008599f0008503a -patword 0x0174 0x0008599f0008503a -patword 0x0175 0x0008599f0008503a -patword 0x0176 0x0008599f0008503a -patword 0x0177 0x0008599f0008503a -patword 0x0178 0x0008599f0008503a -patword 0x0179 0x0008599f0008503a -patword 0x017a 0x0008599f0008503a -patword 0x017b 0x0008599f0008503a -patword 0x017c 0x0008599f0008503a -patword 0x017d 0x0008599f0008503a -patword 0x017e 0x0008599f0008503a -patword 0x017f 0x0008599f0008503a -patword 0x0180 0x0008599f0008503a -patword 0x0181 0x0008599f0008503a -patword 0x0182 0x0008599f0008503a -patword 0x0183 0x0008599f0008503a -patword 0x0184 0x0008599f0008503a -patword 0x0185 0x0008599f0008503a -patword 0x0186 0x0008599f0008503a -patword 0x0187 0x0008599f0008503a -patword 0x0188 0x0008599f0008503a -patword 0x0189 0x0008599f0008503a -patword 0x018a 0x0008599f0008503a -patword 0x018b 0x0008599f0008503a -patword 0x018c 0x0008599f0008503a -patword 0x018d 0x0008599f0008503a +patword 0x0000 0x0008599f0418503a +patword 0x0001 0x0008599f0418503a +patword 0x0002 0x000859960418503a +patword 0x0003 0x000859960418503a +patword 0x0004 0x000859960418503a +patword 0x0005 0x000859960418503a +patword 0x0006 0x000859960418503a +patword 0x0007 0x000859960418503a +patword 0x0008 0x000859960418503a +patword 0x0009 0x000859960418503a +patword 0x000a 0x000859960418503a +patword 0x000b 0x000859960418503a +patword 0x000c 0x000859960418503a +patword 0x000d 0x000859960418503a +patword 0x000e 0x000859960418503a +patword 0x000f 0x000859960418503a +patword 0x0010 0x000859960418503a +patword 0x0011 0x000859960418503a +patword 0x0012 0x000859960418503a +patword 0x0013 0x000859960418503a +patword 0x0014 0x000859960418503a +patword 0x0015 0x000859960418503a +patword 0x0016 0x000819960418501a +patword 0x0017 0x000819960418501a +patword 0x0018 0x000819960418501a +patword 0x0019 0x000819960418501a +patword 0x001a 0x000819960418501a +patword 0x001b 0x000819960418501a +patword 0x001c 0x000819960418501a +patword 0x001d 0x000819960418501a +patword 0x001e 0x000819960418501a +patword 0x001f 0x000819960418501a +patword 0x0020 0x000819960418501a +patword 0x0021 0x000819960418501a +patword 0x0022 0x000819960418501a +patword 0x0023 0x000819960418501a +patword 0x0024 0x000819960418501a +patword 0x0025 0x000819960418501a +patword 0x0026 0x000819960418501a +patword 0x0027 0x000819960418501a +patword 0x0028 0x000819960418501a +patword 0x0029 0x000819960418501a +patword 0x002a 0x000819960418501a +patword 0x002b 0x000819960418501a +patword 0x002c 0x000819960418501a +patword 0x002d 0x000819960418501a +patword 0x002e 0x000819960418501a +patword 0x002f 0x000819960418501a +patword 0x0030 0x000819960008501a +patword 0x0031 0x000819960008501a +patword 0x0032 0x000819960008501a +patword 0x0033 0x000819960008501a +patword 0x0034 0x000819960008501a +patword 0x0035 0x000819960008501a +patword 0x0036 0x000819960008501a +patword 0x0037 0x000819960008501a +patword 0x0038 0x000819960008501a +patword 0x0039 0x000819960008501a +patword 0x003a 0x000819960008501a +patword 0x003b 0x000819960008501a +patword 0x003c 0x000819960008501a +patword 0x003d 0x000819960008501a +patword 0x003e 0x000819960008501a +patword 0x003f 0x000819960008501a +patword 0x0040 0x000819960008501a +patword 0x0041 0x000819960008501a +patword 0x0042 0x000819960008501a +patword 0x0043 0x000819960008501a +patword 0x0044 0x0008199f0008501a +patword 0x0045 0x0008199f0008501a +patword 0x0046 0x0008199f0008501a +patword 0x0047 0x0008199f0008501a +patword 0x0048 0x0008199f0008501a +patword 0x0049 0x0008199f0008501a +patword 0x004a 0x0008199f0008501a +patword 0x004b 0x0008199f0008501a +patword 0x004c 0x0008199f0008501a +patword 0x004d 0x0008199f0008501a +patword 0x004e 0x0008199f0008501a +patword 0x004f 0x0008199f0008501a +patword 0x0050 0x0008199f0008501a +patword 0x0051 0x0008199f0008501a +patword 0x0052 0x0008199f0008501a +patword 0x0053 0x0008199f0008501a +patword 0x0054 0x0008199f0008501a +patword 0x0055 0x0008199f0008501a +patword 0x0056 0x0008199f0008501a +patword 0x0057 0x0008199f0008501a +patword 0x0058 0x0008599f0008503a +patword 0x0059 0x0008599f0008503a +patword 0x005a 0x000c599f000850ba +patword 0x005b 0x000c599f000850ba +patword 0x005c 0x000c599f000850ba +patword 0x005d 0x000c599f000850ba +patword 0x005e 0x000c599f000850ba +patword 0x005f 0x000c599f000850ba +patword 0x0060 0x000c599f000850ba +patword 0x0061 0x000c599f000850ba +patword 0x0062 0x000c599f000850ba +patword 0x0063 0x000c599f000850ba +patword 0x0064 0x000c599f000850ba +patword 0x0065 0x000c599f000850ba +patword 0x0066 0x000c599f000850ba +patword 0x0067 0x000c599f000850ba +patword 0x0068 0x000c599f000850ba +patword 0x0069 0x000c599f000850ba +patword 0x006a 0x000c599f000850ba +patword 0x006b 0x000c599f000850ba +patword 0x006c 0x000c599f000850ba +patword 0x006d 0x000c599f000850ba +patword 0x006e 0x000c799f010858ba +patword 0x006f 0x000c799f010858ba +patword 0x0070 0x000c599f000850ba +patword 0x0071 0x000c599f000850ba +patword 0x0072 0x000c599f000850ba +patword 0x0073 0x000c599f000850ba +patword 0x0074 0x000c599f000850ba +patword 0x0075 0x000c599f000850ba +patword 0x0076 0x000c599f000850ba +patword 0x0077 0x000c599f000850ba +patword 0x0078 0x000c599f000850ba +patword 0x0079 0x000c599f000850ba +patword 0x007a 0x000c599f000850ba +patword 0x007b 0x000c599f000850ba +patword 0x007c 0x000c599f000850ba +patword 0x007d 0x000c599f000850ba +patword 0x007e 0x000c599f000850ba +patword 0x007f 0x000c599f000850ba +patword 0x0080 0x000c599f000850ba +patword 0x0081 0x000c599f000850ba +patword 0x0082 0x000c599f000850ba +patword 0x0083 0x000c599f000850ba +patword 0x0084 0x000c599f000850ba +patword 0x0085 0x000c599f000850ba +patword 0x0086 0x000c599f400850ba +patword 0x0087 0x000c599f400850ba +patword 0x0088 0x000c599f600850ba +patword 0x0089 0x000c599f400850ba +patword 0x008a 0x000c599f400850ba +patword 0x008b 0x000c599f400850ba +patword 0x008c 0x840c599f682e50ba +patword 0x008d 0x840c599f482850ba +patword 0x008e 0x840c599f000e50ba +patword 0x008f 0x840c599f000850ba +patword 0x0090 0x840c599f000e50ba +patword 0x0091 0x840c599f000850ba +patword 0x0092 0x840c599f000e50ba +patword 0x0093 0x840c599f000850ba +patword 0x0094 0x840c599f000e50ba +patword 0x0095 0x840c599f000850ba +patword 0x0096 0x840c599f000e50ba +patword 0x0097 0x840c599f000850ba +patword 0x0098 0x840c599f000e50ba +patword 0x0099 0x840c599f000850ba +patword 0x009a 0x840c599f000e50ba +patword 0x009b 0x840c599f000850ba +patword 0x009c 0x840c599f000e50ba +patword 0x009d 0x840c599f000850ba +patword 0x009e 0x840c599f000e50ba +patword 0x009f 0x840c599f000850ba +patword 0x00a0 0x840c599f000e50ba +patword 0x00a1 0x840c599f000850ba +patword 0x00a2 0x840c599f000e50ba +patword 0x00a3 0x840c599f000850ba +patword 0x00a4 0x840c599f000e50ba +patword 0x00a5 0x840c599f000850ba +patword 0x00a6 0x840c599f200e50ba +patword 0x00a7 0x840c599f000850ba +patword 0x00a8 0x840c599f000e50ba +patword 0x00a9 0x840c599f000850ba +patword 0x00aa 0x840c599f000e50ba +patword 0x00ab 0x840c599f000850ba +patword 0x00ac 0x840c599f000e50ba +patword 0x00ad 0x840c599f000850ba +patword 0x00ae 0x840c599f000e50ba +patword 0x00af 0x840c599f000850ba +patword 0x00b0 0x840c599f000e50ba +patword 0x00b1 0x840c599f000850ba +patword 0x00b2 0x840c599f000e50ba +patword 0x00b3 0x840c599f000850ba +patword 0x00b4 0x840c599f000e50ba +patword 0x00b5 0x840c599f000850ba +patword 0x00b6 0x840c599f000e50ba +patword 0x00b7 0x840c599f000850ba +patword 0x00b8 0x840c599f000e50ba +patword 0x00b9 0x840c599f000850ba +patword 0x00ba 0x840c599f000e50ba +patword 0x00bb 0x840c599f000850ba +patword 0x00bc 0x840c599f000e50ba +patword 0x00bd 0x840c599f000850ba +patword 0x00be 0x840c599f282e50ba +patword 0x00bf 0x840c599f082850ba +patword 0x00c0 0x840c599f000e50ba +patword 0x00c1 0x840c599f000850ba +patword 0x00c2 0x840c599f000e50ba +patword 0x00c3 0x840c599f000850ba +patword 0x00c4 0x840c599f000e50ba +patword 0x00c5 0x840c599f000850ba +patword 0x00c6 0x840c599f000e50ba +patword 0x00c7 0x840c599f000850ba +patword 0x00c8 0x840c599f000e50ba +patword 0x00c9 0x840c599f000850ba +patword 0x00ca 0x840c599f000e50ba +patword 0x00cb 0x840c599f000850ba +patword 0x00cc 0x840c599f000e50ba +patword 0x00cd 0x840c599f000850ba +patword 0x00ce 0x840c599f000e50ba +patword 0x00cf 0x840c599f000850ba +patword 0x00d0 0x840c599f000e50ba +patword 0x00d1 0x840c599f000850ba +patword 0x00d2 0x840c599f000e50ba +patword 0x00d3 0x840c599f000850ba +patword 0x00d4 0x840c599f000e50ba +patword 0x00d5 0x840c599f000850ba +patword 0x00d6 0x840c599f000e50ba +patword 0x00d7 0x840c599f000850ba +patword 0x00d8 0x840c599f200e50ba +patword 0x00d9 0x840c599f000850ba +patword 0x00da 0x840c599f000e50ba +patword 0x00db 0x840c599f000850ba +patword 0x00dc 0x840c599f000e50ba +patword 0x00dd 0x840c599f000850ba +patword 0x00de 0x840c599f000e50ba +patword 0x00df 0x840c599f000850ba +patword 0x00e0 0x840c599f000e50ba +patword 0x00e1 0x840c599f000850ba +patword 0x00e2 0x840c599f000e50ba +patword 0x00e3 0x840c599f000850ba +patword 0x00e4 0x840c599f000e50ba +patword 0x00e5 0x840c599f000850ba +patword 0x00e6 0x840c599f000e50ba +patword 0x00e7 0x840c599f000850ba +patword 0x00e8 0x840c599f000e50ba +patword 0x00e9 0x840c599f000850ba +patword 0x00ea 0x840c599f000e50ba +patword 0x00eb 0x840c599f000850ba +patword 0x00ec 0x840c599f000e50ba +patword 0x00ed 0x840c599f000850ba +patword 0x00ee 0x840c599f000e50ba +patword 0x00ef 0x840c599f000850ba +patword 0x00f0 0x040c599f000850ba +patword 0x00f1 0x040c599f000850ba +patword 0x00f2 0x000c599f000850ba +patword 0x00f3 0x000c599f000850ba +patword 0x00f4 0x0008599f200e503a +patword 0x00f5 0x0008599f0008503a +patword 0x00f6 0x0008599f200e503a +patword 0x00f7 0x0008599f0008503a +patword 0x00f8 0x0008599f0008503a +patword 0x00f9 0x0008599f0008503a +patword 0x00fa 0x0008599f0008503a +patword 0x00fb 0x0008599f0008503a +patword 0x00fc 0x0008599f0008503a +patword 0x00fd 0x0008599f0008503a +patword 0x00fe 0x0008599f0008503a +patword 0x00ff 0x0008599f0008503a +patword 0x0100 0x0008599f0008503a +patword 0x0101 0x0008599f0008503a +patword 0x0102 0x0008599f0008503a +patword 0x0103 0x0008599f0008503a +patword 0x0104 0x0008599f0008503a +patword 0x0105 0x0008599f0008503a +patword 0x0106 0x0008599f0008503a +patword 0x0107 0x0008599f0008503a +patword 0x0108 0x0008599f0008503a +patword 0x0109 0x0008599f0008503a +patword 0x010a 0x0008599f0008503a +patword 0x010b 0x0008599f0008503a +patword 0x010c 0x0008599f0008503a +patword 0x010d 0x0008599f0008503a +patword 0x010e 0x0008599f0008503a +patword 0x010f 0x0008599f0008503a +patword 0x0110 0x0008599f0008503a +patword 0x0111 0x0008599f0008503a patioctrl 0x8f0effff6dbffdbf patclkctrl 0x0000000000000000 -patlimits 0x0000 0x018c -patloop0 0x013a 0x016b +patlimits 0x0000 0x0110 +patloop0 0x00be 0x00ef patnloop0 199 patloop1 0x0400 0x0400 patnloop1 0 patloop2 0x0400 0x0400 patnloop2 0 -patwait0 0x00aa -patwaittime0 10000 +patwait0 0x002e +patwaittime0 800 patwait1 0x0400 patwaittime1 0 patwait2 0x0400 patwaittime2 0 - diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 4cbf3e587..03b1a40c4 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 694d4eb83..097cf14a9 100755 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -82,15 +82,26 @@ enum CLKINDEX {RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS}; #define DEFAULT_SETTINGS (G4_HIGHGAIN) // settings -#define DEFAULT_PATSETBIT (0x40800000115ULL) -#define G1_HIGHGAIN_PATMASK (0x40800000101ULL) -#define G1_LOWGAIN_PATMASK (0x40000000100ULL) -#define G2_HIGHCAP_HIGHGAIN_PATMASK (0x00800000001ULL) -#define G2_HIGHCAP_LOWGAIN_PATMASK (0x00000000000ULL) -#define G2_LOWCAP_HIGHGAIN_PATMASK (0x40800000115ULL) -#define G2_LOWCAP_LOWGAIN_PATMASK (0x40000000114ULL) -#define G4_HIGHGAIN_PATMASK (0x00800000015ULL) -#define G4_LOWGAIN_PATMASK (0x00000000014ULL) + +/* #define DEFAULT_PATSETBIT (0x40800000115ULL) */ +/* #define G1_HIGHGAIN_PATMASK (0x40800000101ULL) */ +/* #define G1_LOWGAIN_PATMASK (0x40000000100ULL) */ +/* #define G2_HIGHCAP_HIGHGAIN_PATMASK (0x00800000001ULL) */ +/* #define G2_HIGHCAP_LOWGAIN_PATMASK (0x00000000000ULL) */ +/* #define G2_LOWCAP_HIGHGAIN_PATMASK (0x40800000115ULL) */ +/* #define G2_LOWCAP_LOWGAIN_PATMASK (0x40000000114ULL) */ +/* #define G4_HIGHGAIN_PATMASK (0x00800000015ULL) */ +/* #define G4_LOWGAIN_PATMASK (0x00000000014ULL) */ + +#define DEFAULT_PATSETBIT (0x00000C800000800AULL) +#define G1_HIGHGAIN_PATMASK (0x00000C0000008008ULL) +#define G1_LOWGAIN_PATMASK (0x0000040000008000ULL) +#define G2_HIGHCAP_HIGHGAIN_PATMASK (0x0000080000000008ULL) +#define G2_HIGHCAP_LOWGAIN_PATMASK (0x0000000000000000ULL) +#define G2_LOWCAP_HIGHGAIN_PATMASK (0x00000C800000800AULL) +#define G2_LOWCAP_LOWGAIN_PATMASK (0x0000048000008002ULL) +#define G4_HIGHGAIN_PATMASK (0x000008800000000AULL) +#define G4_LOWGAIN_PATMASK (0x0000008000000002ULL) #define HIGHVOLTAGE_MIN (60) #define HIGHVOLTAGE_MAX (200) // min dac val