mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-24 23:30:03 +02:00
conflict resolution with developer
This commit is contained in:
commit
fc025bd28b
Binary file not shown.
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@ -53,7 +53,7 @@ Frequently Asked Questions">
|
||||
Frequently Asked Questions</H1>
|
||||
<P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
|
||||
</P>
|
||||
<BR><P ALIGN=CENTER><B>Date:</B> August 24, 2017</P>
|
||||
<BR><P ALIGN=CENTER><B>Date:</B> September 27, 2017</P>
|
||||
|
||||
<HR>
|
||||
|
||||
@ -244,7 +244,7 @@ Frequently Asked Questions</H1>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -198,7 +198,7 @@ Contents</A>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -195,7 +195,7 @@ Read Out Trigger mode: the external trigger signal defines the beginning of the
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -103,7 +103,7 @@ After the configuration, the synchronization of the controllers will be complete
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -103,7 +103,7 @@ A simple high-level solution in case you need to maintain the software for sever
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -187,7 +187,7 @@ JUNGFRAU</A>
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -81,7 +81,7 @@ General questions about detectors</A>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -203,7 +203,7 @@ Settings to be chosen for the MYTHEN detector as a function of the X-ray energy
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -105,7 +105,7 @@ In case the board has some memory that can be accessed by the hardware, this is
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -109,7 +109,7 @@ Single photon counting detectors</A>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -146,7 +146,7 @@ Plot indicating the reccomended choice of detector settings as a function of the
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -305,7 +305,7 @@ Example of data from a sample emitting fluorescent light and detector threshold
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -111,7 +111,7 @@ SLS Detectors Software</A>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -171,7 +171,7 @@ Sketch of the experimental setup for a dynamic acquisition of the flat field.</C
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -258,7 +258,7 @@ The authomatic loading of energy-specific trim files is not yet implemented.
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -179,7 +179,7 @@ Reading and analyzing the data takes some time, but, after a while, a canvas sho
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -110,7 +110,7 @@ The class slsDetectorUsers can be used as API from your acquisition software (se
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -158,7 +158,7 @@ You will need to configure more than one detector, only in case you want to oper
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -133,7 +133,7 @@ The client will take care of communicating with the data receiver and the detect
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -143,7 +143,7 @@ It must contain the subdirectories <code>dynamicgain</code>, <code>gain1</code>,
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -71,7 +71,7 @@ The configuration files look different for the different detector types. Example
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -80,7 +80,7 @@ where:
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -337,7 +337,7 @@ where i si the <I>file index</I> and p is the <I>stop script parameter</I>.
|
||||
<!--End of Navigation Panel-->
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
@ -53,7 +53,7 @@ Frequently Asked Questions">
|
||||
Frequently Asked Questions</H1>
|
||||
<P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
|
||||
</P>
|
||||
<BR><P ALIGN=CENTER><B>Date:</B> August 24, 2017</P>
|
||||
<BR><P ALIGN=CENTER><B>Date:</B> September 27, 2017</P>
|
||||
|
||||
<HR>
|
||||
|
||||
@ -244,7 +244,7 @@ Frequently Asked Questions</H1>
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2017-08-24
|
||||
2017-09-27
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user