detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-19 18:40:01 +02:00
Code Issues Actions Packages Releases Activity

Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider

Browse Source
This commit is contained in:
maliakal_d 2018-03-20 12:12:38 +01:00
parent 85aa47b835
commit 688dd15fe9
37 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/docs/html/slsDetectorClientDocs/acquisition.html
View File

@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/actions.html
View File

@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/advanced.html
View File

@ -54,7 +54,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

6
manual/docs/html/slsDetectorClientDocs/config.html
View File

@ -183,7 +183,7 @@ Versions</a></h2>
Speed</a></h2> Speed</a></h2>
<p>commands to configure speed of detector</p> <p>commands to configure speed of detector</p>
<ul> <ul>
<li><b>clkdivider [i]</b> sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. MYTHEN[???]. <code>Returns</code> <code></code>(int)</li> <li><b>clkdivider [i]</b> sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. Jungfrau, full speed is not implemented and overwrites adcphase to recommended default. MYTHEN[???]. <code>Returns</code> <code></code>(int)</li>
</ul> </ul>
<ul> <ul>
<li><b>setlength [i]</b> sets/gets length of set/reset signals (in clock cycles). Used in MYTHEN only. <code>Returns</code> <code></code>(int)</li> <li><b>setlength [i]</b> sets/gets length of set/reset signals (in clock cycles). Used in MYTHEN only. <code>Returns</code> <code></code>(int)</li>
@ -207,7 +207,7 @@ Speed</a></h2>
<li><b>adcclk [i]</b> sets/gets the ADC clock frequency in MHz. For the new chiptestboard!<code>Returns</code> <code></code>(int)</li> <li><b>adcclk [i]</b> sets/gets the ADC clock frequency in MHz. For the new chiptestboard!<code>Returns</code> <code></code>(int)</li>
</ul> </ul>
<ul> <ul>
<li><b>adcphase [i]</b> Sets/gets the ADC clock frequency in MHz. For the new chiptestboard!<code>Returns</code> <code></code>(int)</li> <li><b>adcphase [i]</b> Sets/gets phase of the sampling clock. For JUNGFRAU, setting speed (clkdivider) overwrites adcphase to its default recommended value. (Not for EIGER) <code>Returns</code> <code></code>(int)</li>
</ul> </ul>
<ul> <ul>
<li><b>adcpipeline [i]</b> Sets/gets the pipeline of the ADC. For the new chiptestbaord!<code>Returns</code> <code></code>(int)</li> <li><b>adcpipeline [i]</b> Sets/gets the pipeline of the ADC. For the new chiptestbaord!<code>Returns</code> <code></code>(int)</li>
@ -251,7 +251,7 @@ Detector Parameters</a></h2>
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/ctb.html
View File

@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/data.html
View File

@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/index.html
View File

@ -83,7 +83,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/network.html
View File

@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/output.html
View File

@ -75,7 +75,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/pages.html
View File

@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/receiver.html
View File

@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/settings.html
View File

@ -317,7 +317,7 @@ Temp Control</a></h2>
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/test.html
View File

@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientDocs/timing.html
View File

@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</iframe> </iframe>
</div> </div>
<hr size="1"/><address style="text-align: right;"><small>Generated on 12 Mar 2018 by&nbsp; <hr size="1"/><address style="text-align: right;"><small>Generated on 20 Mar 2018 by&nbsp;
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
</body> </body>

2
manual/docs/html/slsDetectorClientHowTo/images.log
View File

@ -1,4 +1,4 @@
This is pdfTeXk, Version 3.141592-1.40.3 (Web2C 7.5.6) (format=latex 2014.12.17) 12 MAR 2018 15:45 This is pdfTeXk, Version 3.141592-1.40.3 (Web2C 7.5.6) (format=latex 2014.12.17) 20 MAR 2018 12:10
entering extended mode entering extended mode
%&-line parsing enabled. %&-line parsing enabled.
**./images.tex **./images.tex

4
manual/docs/html/slsDetectorClientHowTo/index.html
View File

@ -43,7 +43,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<H1 ALIGN="CENTER">SLS Detector text clients manual</H1> <H1 ALIGN="CENTER">SLS Detector text clients manual</H1>
<DIV> <DIV>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P> <P ALIGN="CENTER"><STRONG>March 20, 2018</STRONG></P>
</DIV> </DIV>
<P> <P>
@ -148,7 +148,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR> <BR><HR>
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

2
manual/docs/html/slsDetectorClientHowTo/node1.html
View File

@ -123,7 +123,7 @@ For additional questions concerning the indexing of the detector, please refer t
<!--End of Navigation Panel--> <!--End of Navigation Panel-->
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

2
manual/docs/html/slsDetectorClientHowTo/node2.html
View File

@ -68,7 +68,7 @@ For additional questions concerning the acquisition flow, please refer to the <I
<BR><HR> <BR><HR>
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

2
manual/docs/html/slsDetectorClientHowTo/node3.html
View File

@ -763,7 +763,7 @@ Debug</A>
<!--End of Navigation Panel--> <!--End of Navigation Panel-->
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

2
manual/docs/html/slsDetectorClientHowTo/node4.html
View File

@ -815,7 +815,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
<!--End of Navigation Panel--> <!--End of Navigation Panel-->
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

2
manual/docs/html/slsDetectorClientHowTo/node5.html
View File

@ -160,7 +160,7 @@ sls_detector_put ratecorr -1
<!--End of Navigation Panel--> <!--End of Navigation Panel-->
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

4
manual/docs/html/slsDetectorClientHowTo/node6.html
View File

@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
The command line arguments were: <BR> The command line arguments were: <BR>
<STRONG>latex2html</STRONG> <TT>-split 4 slsDetectorClientHowTo.tex</TT> <STRONG>latex2html</STRONG> <TT>-split 4 slsDetectorClientHowTo.tex</TT>
<P> <P>
The translation was initiated by Thattil Dhanya on 2018-03-12 The translation was initiated by Thattil Dhanya on 2018-03-20
<BR><HR> <BR><HR>
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

4
manual/docs/html/slsDetectorClientHowTo/slsDetectorClientHowTo.html
View File

@ -43,7 +43,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<H1 ALIGN="CENTER">SLS Detector text clients manual</H1> <H1 ALIGN="CENTER">SLS Detector text clients manual</H1>
<DIV> <DIV>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P> <P ALIGN="CENTER"><STRONG>March 20, 2018</STRONG></P>
</DIV> </DIV>
<P> <P>
@ -148,7 +148,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR> <BR><HR>
<ADDRESS> <ADDRESS>
Thattil Dhanya Thattil Dhanya
2018-03-12 2018-03-20
</ADDRESS> </ADDRESS>
</BODY> </BODY>
</HTML> </HTML>

BIN
manual/docs/pdf/slsDetectorClientDocs.pdf
View File

Binary file not shown.

BIN
manual/docs/pdf/slsDetectorClientHowTo.pdf
View File

Binary file not shown.

1
serverBin/jungfrauDetectorServerv3.1.0.2
View File

@ -1 +0,0 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2

1
serverBin/jungfrauDetectorServerv3.1.1.0 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.1.0

12
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b389402d647e939342dbb2c9317c688c0eb6b105 Repsitory UUID: 85aa47b8353bb84f52c435a967a03ddf46af5dd1
Revision: 1714 Revision: 1716
Branch: 3.1.0-rc Branch: 3.1.1-rc
Last Changed Author: Erik_Frojdh Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3458 Last Changed Rev: 3465
Last Changed Date: 2018-03-12 14:19:44.000000002 +0100 ./threadFiles/ThreadPool.o Last Changed Date: 2018-03-19 18:13:27.000000002 +0100 ./threadFiles/ThreadPool.o

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2 → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.1.0
View File

Binary file not shown.

12
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa Repsitory UUID: 85aa47b8353bb84f52c435a967a03ddf46af5dd1
Revision: 117 Revision: 118
Branch: 3.1.0-rc Branch: 3.1.1-rc
Last Changed Author: Erik_Frojdh Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3455 Last Changed Rev: 3465
Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2018-03-19 17:26:38.000000002 +0100 ./RegisterDefs.h

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa" #define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
#define GITAUTH "Erik_Frojdh" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3455 #define GITREV 0x3465
#define GITDATE 0x20180308 #define GITDATE 0x20180319
#define GITBRANCH "3.1.0-rc" #define GITBRANCH "3.1.1-rc"

12
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -487,9 +487,11 @@ int adcPhase(int st){ /**carlos needed clkphase 1 and 2? cehck with Aldo */
printf("Setting ADC Phase to %d\n",st); printf("Setting ADC Phase to %d\n",st);
if (st > 65535 || st < -65535) if (st > 65535 || st < -65535)
return clkPhase[0]; return clkPhase[0];
clkPhase[1] = st - clkPhase[0];
printf(" phase %d\n", clkPhase[1] ); clkPhase[1] = st - clkPhase[0];
if (clkPhase[1] == 0)
return clkPhase[0];
configurePll(); configurePll();
clkPhase[0] = st; clkPhase[0] = st;
return clkPhase[0]; return clkPhase[0];
@ -1230,8 +1232,12 @@ void configurePll() {
#endif #endif
u_int32_t val; u_int32_t val;
int32_t phase=0, inv=0; int32_t phase=0, inv=0;
// ensuring PLL is never configured with same phase
if (clkPhase[1] == 0) {
return;
}
printf(" phase in %d\n", clkPhase[1]); printf("Configuring PLL with phase in %d\n", clkPhase[1]);
if (clkPhase[1]>0) { if (clkPhase[1]>0) {
inv=0; inv=0;
phase=clkPhase[1]; phase=clkPhase[1];

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -101,8 +101,8 @@ enum NETWORKINDEX { TXN_FRAME };
#define CONFIG_QUARTER_SPEED (CONFIG_TDMA_DISABLE_VAL + CONFIG_QUARTER_SPEED_10MHZ_VAL + CONFIG_MODE_1_X_10GBE_VAL) #define CONFIG_QUARTER_SPEED (CONFIG_TDMA_DISABLE_VAL + CONFIG_QUARTER_SPEED_10MHZ_VAL + CONFIG_MODE_1_X_10GBE_VAL)
#define ADC_OFST_HALF_SPEED_VAL (0x20) //adc pipeline #define ADC_OFST_HALF_SPEED_VAL (0x20) //adc pipeline
#define ADC_OFST_QUARTER_SPEED_VAL (0x0f) #define ADC_OFST_QUARTER_SPEED_VAL (0x0f)
#define ADC_PHASE_HALF_SPEED (0x41) #define ADC_PHASE_HALF_SPEED (0x48) //72
#define ADC_PHASE_QUARTER_SPEED (0x19) #define ADC_PHASE_QUARTER_SPEED (0x48) //72
/* Maybe not required for jungfrau */ /* Maybe not required for jungfrau */
#define NTRIMBITS (6) #define NTRIMBITS (6)

10
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105" #define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
#define GITAUTH "Erik_Frojdh" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3458 #define GITREV 0x3465
#define GITDATE 0x20180312 #define GITDATE 0x20180319
#define GITBRANCH "3.1.0-rc" #define GITBRANCH "3.1.1-rc"

13
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -710,7 +710,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
*/ */
/*! \page config /*! \page config
- <b>clkdivider [i]</b> sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. MYTHEN[???]. \c Returns \c (int) - <b>clkdivider [i]</b> sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. Jungfrau, full speed is not implemented and overwrites adcphase to recommended default. MYTHEN[???]. \c Returns \c (int)
*/ */
descrToFuncMap[i].m_pFuncName="clkdivider"; // descrToFuncMap[i].m_pFuncName="clkdivider"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
@ -766,7 +766,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
++i; ++i;
/*! \page config /*! \page config
- <b>adcphase [i]</b> Sets/gets the ADC clock frequency in MHz. For the new chiptestboard!\c Returns \c (int) - <b>adcphase [i]</b> Sets/gets phase of the sampling clock. For JUNGFRAU, setting speed (clkdivider) overwrites adcphase to its default recommended value. (Not for EIGER) \c Returns \c (int)
*/ */
descrToFuncMap[i].m_pFuncName="adcphase"; // descrToFuncMap[i].m_pFuncName="adcphase"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
@ -5685,9 +5685,6 @@ string slsDetectorCommand::cmdSpeed(int narg, char *args[], int action) {
return string("cannot scan speed value ")+string(args[1]); return string("cannot scan speed value ")+string(args[1]);
} }
// -1 could work
else if (cmd=="adcphase")
t = 65536;
myDet->setOnline(ONLINE_FLAG); myDet->setOnline(ONLINE_FLAG);
@ -5707,21 +5704,23 @@ string slsDetectorCommand::helpSpeed(int narg, char *args[], int action) {
ostringstream os; ostringstream os;
if (action==PUT_ACTION || action==HELP_ACTION) { if (action==PUT_ACTION || action==HELP_ACTION) {
os << "clkdivider c \t sets readout clock divider" << std::endl; os << "clkdivider c \t sets readout clock divider. For Jungfrau, it also overwrites adcphase to recommended default" << std::endl;
os << "setlength c\t sets the length of the set/reset signals (in clock cycles)" << std::endl; os << "setlength c\t sets the length of the set/reset signals (in clock cycles)" << std::endl;
os << "waitstates c \t sets the waitstates of the bus interface" << std::endl; os << "waitstates c \t sets the waitstates of the bus interface" << std::endl;
os << "totdivider c\t sets the clock divider in tot mode" << std::endl; os << "totdivider c\t sets the clock divider in tot mode" << std::endl;
os << "totdutycycle c\t sets the duty cycle of the tot clock" << std::endl; os << "totdutycycle c\t sets the duty cycle of the tot clock" << std::endl;
os << "adcphase c\t Sets phase of the sampling clock. For JUNGFRAU, setting speed (clkdivider) overwrites adcphase to its default recommended value. (Not for EIGER)" << std::endl;
os << std::endl; os << std::endl;
} }
if (action==GET_ACTION || action==HELP_ACTION) { if (action==GET_ACTION || action==HELP_ACTION) {
os << "clkdivider \t gets readout clock divider" << std::endl; os << "clkdivider \t gets readout clock divider. For Jungfrau, it also overwrites adcphase to recommended default" << std::endl;
os << "setlength \t gets the length of the set/reset signals (in clock cycles)" << std::endl; os << "setlength \t gets the length of the set/reset signals (in clock cycles)" << std::endl;
os << "waitstates \t gets the waitstates of the bus interface" << std::endl; os << "waitstates \t gets the waitstates of the bus interface" << std::endl;
os << "totdivider \t gets the clock divider in tot mode" << std::endl; os << "totdivider \t gets the clock divider in tot mode" << std::endl;
os << "totdutycycle \t gets the duty cycle of the tot clock" << std::endl; os << "totdutycycle \t gets the duty cycle of the tot clock" << std::endl;
os << "totdutycycle \t gets phase of the sampling clock. For JUNGFRAU, setting speed (clkdivider) overwrites adcphase to its default recommended value. (Not for EIGER)" << std::endl;
os << std::endl; os << std::endl;
} }

4
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -77,7 +77,7 @@ You can find examples of how this classes can be instatiated in mainClient.cpp
@libdoc The slsDetectorUsers class is a minimal interface class which should be instantiated by the users in their acquisition software (EPICS, spec etc.). More advanced configuration functions are not implemented and can be written in a configuration or parameters file that can be read/written. @libdoc The slsDetectorUsers class is a minimal interface class which should be instantiated by the users in their acquisition software (EPICS, spec etc.). More advanced configuration functions are not implemented and can be written in a configuration or parameters file that can be read/written.
*/ */
/** /**
@short Class for detector functionalitiesto embed the detector controls in the users custom interface e.g. EPICS, Lima etc. @short Class for detector functionalities to embed the detector controls in the users custom interface e.g. EPICS, Lima etc.
*/ */
@ -270,7 +270,7 @@ class slsDetectorUsers
*/ */
int getDetectorSize(int &x0, int &y0, int &nx, int &ny); int getDetectorSize(int &x0, int &y0, int &nx, int &ny);
/** /**
@short setsthe maximum detector size @short gets the maximum detector size
\param x0 horizontal position origin in channel number \param x0 horizontal position origin in channel number
\param y0 vertical position origin in channel number \param y0 vertical position origin in channel number
\param nx number of channels in horiziontal \param nx number of channels in horiziontal

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2988,7 +2988,7 @@ int set_speed(int file_des) {
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
case ADC_PHASE: case ADC_PHASE:
retval = adcPhase(val); retval = adcPhase(val);
if ((val != 65536) && (retval!=val) && (val>=0)) { if ((val != 100000) && (retval!=val) && (val>=0)) {
ret=FAIL; ret=FAIL;
sprintf(mess,"could not change set adc phase: should be %d but is %d \n", val, retval); sprintf(mess,"could not change set adc phase: should be %d but is %d \n", val, retval);
cprintf(RED, "Warning: %s", mess); cprintf(RED, "Warning: %s", mess);