]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/log
daqtools.git
11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Michael Traxler [Wed, 2 Apr 2014 22:27:01 +0000 (00:27 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years agoaddresses_trb3.db
Michael Traxler [Wed, 2 Apr 2014 22:26:12 +0000 (00:26 +0200)]
addresses_trb3.db

11 years agonxyter update
Ludwig Maier [Thu, 27 Mar 2014 16:30:08 +0000 (17:30 +0100)]
nxyter update

11 years agoSome quick Padiwa AMPS setup file for Mainz A2
Andreas Neiser [Mon, 10 Mar 2014 14:14:19 +0000 (15:14 +0100)]
Some quick Padiwa AMPS setup file for Mainz A2

11 years agoAdd Calibration Prescaler to TDC Webinterface (for TDC v1.6)
Andreas Neiser [Mon, 10 Mar 2014 14:13:42 +0000 (15:13 +0100)]
Add Calibration Prescaler to TDC Webinterface (for TDC v1.6)

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Your Name [Fri, 7 Mar 2014 10:24:06 +0000 (11:24 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years agoadded web interface for input monitor
Your Name [Fri, 7 Mar 2014 10:24:02 +0000 (11:24 +0100)]
added web interface for input monitor

11 years agoAddon info for 32PinAddOn is added
Cahit Ugur [Fri, 7 Mar 2014 09:11:00 +0000 (10:11 +0100)]
Addon info for 32PinAddOn is added

11 years agonxyter update registers
Ludwig Maier [Thu, 6 Mar 2014 23:40:20 +0000 (00:40 +0100)]
nxyter update registers

11 years agochanged xml page titles for more detail
Jan Michel [Thu, 6 Mar 2014 22:17:34 +0000 (23:17 +0100)]
changed xml page titles for more detail

11 years agoReassignment of peripheral FPGAs' trigger lines - this is hardcoded, and hence incomp...
Manuel Penschuck [Thu, 6 Mar 2014 17:12:47 +0000 (18:12 +0100)]
Reassignment of peripheral FPGAs' trigger lines - this is hardcoded, and hence incompatible with the now revoked bit-file from 5. March 2014

11 years agoadded DABC config file
Your Name [Thu, 6 Mar 2014 10:17:56 +0000 (11:17 +0100)]
added DABC config file

11 years agoupdated monitoring registers
Your Name [Thu, 6 Mar 2014 10:17:09 +0000 (11:17 +0100)]
updated monitoring registers

11 years agoCTS Output MUX
Manuel Penschuck [Wed, 5 Mar 2014 16:59:08 +0000 (17:59 +0100)]
CTS Output MUX

11 years agoBugfix regarding non-standard-conform syntax allowed by FF but not Chrome
Manuel Penschuck [Wed, 5 Mar 2014 16:58:35 +0000 (17:58 +0100)]
Bugfix regarding non-standard-conform syntax allowed by FF but not Chrome

11 years agonxyter update
Ludwig Maier [Tue, 4 Mar 2014 22:29:17 +0000 (23:29 +0100)]
nxyter update

11 years agonxyter new web design, added nxyter advanced link
Ludwig Maier [Tue, 4 Mar 2014 19:39:01 +0000 (20:39 +0100)]
nxyter new web design, added nxyter advanced link

11 years agosome adjustment for setup at xbox
Your Name [Tue, 4 Mar 2014 11:43:48 +0000 (12:43 +0100)]
some adjustment for setup at xbox

11 years agoadded definition of Input Trigger Generation
Jan Michel [Tue, 4 Mar 2014 11:00:26 +0000 (12:00 +0100)]
added definition of Input Trigger Generation

11 years agoadded definition of Input Monitor
Jan Michel [Tue, 4 Mar 2014 10:50:39 +0000 (11:50 +0100)]
added definition of Input Monitor

11 years agonxyter register updates
Ludwig Maier [Mon, 3 Mar 2014 23:59:01 +0000 (00:59 +0100)]
nxyter register updates

11 years agohttpi now supports WebSocket-Requests (for simplicity much session handling is done...
Manuel Penschuck [Mon, 3 Mar 2014 17:02:17 +0000 (18:02 +0100)]
httpi now supports WebSocket-Requests (for simplicity much session handling is done by the CGI script)
Added CTS AddOn Output Mux
Added Triggers from TRB3 peripheral FPGAs
Support for unified trigger input multiplexer (WARNING: This required a renaming of some CTS-AddOn related input registers, breaking compatibility with older cts-startup scripts!)

11 years agoCTS extensions - not working yet
Manuel Penschuck [Sun, 2 Mar 2014 19:37:54 +0000 (20:37 +0100)]
CTS extensions - not working yet

11 years agoMerge branch 'master' of jspc29:daqtools
www@jspc55 [Fri, 28 Feb 2014 13:27:11 +0000 (14:27 +0100)]
Merge branch 'master' of jspc29:daqtools

11 years agocorrect ADC->voltage conversion factors/offsets for CB2013
www@jspc55 [Fri, 28 Feb 2014 13:27:06 +0000 (14:27 +0100)]
correct ADC->voltage conversion factors/offsets for CB2013

11 years agonew version
Your Name [Tue, 18 Feb 2014 15:34:35 +0000 (16:34 +0100)]
new version

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Your Name [Tue, 18 Feb 2014 14:56:05 +0000 (15:56 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years agofirst files for xbox diamond readout
Your Name [Tue, 18 Feb 2014 14:54:44 +0000 (15:54 +0100)]
first files for xbox diamond readout

11 years agonxyter register update
Ludwig Maier [Mon, 17 Feb 2014 02:11:09 +0000 (03:11 +0100)]
nxyter register update

11 years agonxyter register update
Ludwig Maier [Mon, 17 Feb 2014 02:03:58 +0000 (03:03 +0100)]
nxyter register update

11 years agoupdate
Ludwig Maier [Mon, 10 Feb 2014 01:38:34 +0000 (02:38 +0100)]
update

11 years agonxyter register update
Ludwig Maier [Mon, 3 Feb 2014 16:30:44 +0000 (17:30 +0100)]
nxyter register update

11 years agonxyter register update
Ludwig Maier [Fri, 31 Jan 2014 19:04:14 +0000 (20:04 +0100)]
nxyter register update

11 years agoThe size of the table is readjusted to fit the writings.
Cahit Ugur [Thu, 30 Jan 2014 16:40:04 +0000 (17:40 +0100)]
The size of the table is readjusted to fit the writings.

11 years agoThe size of the table is readjusted to fit the writings.
Cahit Ugur [Thu, 30 Jan 2014 16:39:20 +0000 (17:39 +0100)]
The size of the table is readjusted to fit the writings.

11 years agoname & id of text inputs for trigger window are updated.
Cahit Ugur [Thu, 30 Jan 2014 16:20:26 +0000 (17:20 +0100)]
name & id of text inputs for trigger window are updated.

11 years agoText input for the trigger window in the TDC Registers is implemented.
Cahit Ugur [Thu, 30 Jan 2014 15:57:26 +0000 (16:57 +0100)]
Text input for the trigger window in the TDC Registers is implemented.

11 years agoadded putbitrange.pl command on webpage to access the loadbit function of trbcmd...
Jan Michel [Wed, 29 Jan 2014 16:28:55 +0000 (17:28 +0100)]
added putbitrange.pl command on webpage to access the loadbit function of trbcmd - not working yet because command missing in libtrbnet_perl. Removed Data::Dumper from some commands

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Cahit Ugur [Tue, 28 Jan 2014 12:24:06 +0000 (13:24 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years agoRESET button for the TDC registers is added.
Cahit Ugur [Tue, 28 Jan 2014 12:23:36 +0000 (13:23 +0100)]
RESET button for the TDC registers is added.

11 years agonxyter register update
Ludwig Maier [Tue, 28 Jan 2014 12:15:24 +0000 (13:15 +0100)]
nxyter register update

11 years agohistogram.pl should be usable now
Andreas Neiser [Thu, 23 Jan 2014 09:01:22 +0000 (10:01 +0100)]
histogram.pl should be usable now

11 years agoAdding a threshold scanner/histogrammer, no plotting support yet
Andreas Neiser [Wed, 22 Jan 2014 18:20:48 +0000 (19:20 +0100)]
Adding a threshold scanner/histogrammer, no plotting support yet

11 years agoUsers/Mainz: Better Ethernet setup, old template was wrong!
Andreas Neiser [Tue, 21 Jan 2014 08:15:57 +0000 (09:15 +0100)]
Users/Mainz: Better Ethernet setup, old template was wrong!

11 years agoReplacing header() call by plain string, more portable!
Andreas Neiser [Tue, 21 Jan 2014 08:09:29 +0000 (09:09 +0100)]
Replacing header() call by plain string, more portable!

11 years agomodified web commands to run in apache and httpi
Jan Michel [Mon, 20 Jan 2014 16:23:44 +0000 (17:23 +0100)]
modified web commands to run in apache and httpi

11 years agomodified web commands to run in apache and httpi
Jan Michel [Mon, 20 Jan 2014 13:20:14 +0000 (14:20 +0100)]
modified web commands to run in apache and httpi

11 years agoMissing scripts
Hadaq@styx [Fri, 17 Jan 2014 23:39:58 +0000 (00:39 +0100)]
Missing scripts

11 years agoMainz A2: Workaround for UDP packets larger than MTU, and some minor adaptions
Andreas Neiser [Fri, 17 Jan 2014 09:19:47 +0000 (10:19 +0100)]
Mainz A2: Workaround for UDP packets larger than MTU, and some minor adaptions

11 years agoGit ignore the CTS shared mem symlinks
Andreas Neiser [Fri, 17 Jan 2014 09:17:40 +0000 (10:17 +0100)]
Git ignore the CTS shared mem symlinks

11 years agoadded new control reg for SPI fifo
Jan Michel [Thu, 16 Jan 2014 15:27:47 +0000 (16:27 +0100)]
added new control reg for SPI fifo

11 years agoadded HPlot lib & added fifomode to hadplot multi-reg
Jan Michel [Thu, 16 Jan 2014 15:25:12 +0000 (16:25 +0100)]
added HPlot lib & added fifomode to hadplot multi-reg

11 years agoadded SensorControlStatus registers to xml-db/CbController
Maps [Thu, 16 Jan 2014 14:45:43 +0000 (15:45 +0100)]
added SensorControlStatus registers to xml-db/CbController

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
hadaq [Thu, 16 Jan 2014 00:20:22 +0000 (01:20 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
merged, mt

11 years agocorrected help text in hadplot
Jan Michel [Wed, 15 Jan 2014 14:33:14 +0000 (15:33 +0100)]
corrected help text in hadplot

11 years agoadded function to write write-only registers. The web-gui displays them, if at least...
Jan Michel [Mon, 13 Jan 2014 14:29:52 +0000 (15:29 +0100)]
added function to write write-only registers. The web-gui displays them, if at least one read-able register was included in the request before the write-only register

11 years agonew gen of histograming
Hadaq@styx [Mon, 13 Jan 2014 01:50:10 +0000 (02:50 +0100)]
new gen of histograming

11 years agoMerge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools
hadaq [Fri, 10 Jan 2014 00:36:28 +0000 (01:36 +0100)]
Merge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools

11 years agoadded link to MVD CbController
Jan Michel [Thu, 9 Jan 2014 13:36:37 +0000 (14:36 +0100)]
added link to MVD CbController

11 years agoadded register for direct overcurrent detection
Jan Michel [Wed, 8 Jan 2014 14:59:02 +0000 (15:59 +0100)]
added register for direct overcurrent detection

11 years agofixed units and type in CB voltage measurements
Jan Michel [Wed, 8 Jan 2014 13:07:54 +0000 (14:07 +0100)]
fixed units and type in CB voltage measurements

11 years agoadded more units in JtagController
Jan Michel [Wed, 8 Jan 2014 13:03:27 +0000 (14:03 +0100)]
added more units in JtagController

11 years agofixed bug in rate display in composite registers, added rates in JtagController
Jan Michel [Wed, 8 Jan 2014 12:38:18 +0000 (13:38 +0100)]
fixed bug in rate display in composite registers, added rates in JtagController

11 years agoadded registers for converter board ADC read-back
Jan Michel [Tue, 7 Jan 2014 17:50:22 +0000 (18:50 +0100)]
added registers for converter board ADC read-back

11 years agoMerge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools
hadaq [Tue, 7 Jan 2014 15:15:26 +0000 (16:15 +0100)]
Merge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools

11 years agolatest changes of xml DB files
Maps [Mon, 6 Jan 2014 16:20:35 +0000 (17:20 +0100)]
latest changes of xml DB files

11 years agominor fix
Michael Wiebusch [Fri, 20 Dec 2013 15:36:05 +0000 (16:36 +0100)]
minor fix

11 years agoadded two more debug registers to CbController.xml
Michael Wiebusch [Fri, 20 Dec 2013 15:29:31 +0000 (16:29 +0100)]
added two more debug registers to CbController.xml

11 years agocorrected flag for single-bit fields to get.pl
Jan Michel [Fri, 20 Dec 2013 15:21:32 +0000 (16:21 +0100)]
corrected flag for single-bit fields to get.pl

11 years agocorrected flag for single-bit fields to get.pl
Jan Michel [Fri, 20 Dec 2013 15:19:35 +0000 (16:19 +0100)]
corrected flag for single-bit fields to get.pl

11 years agoadded flag for single-bit fields to get.pl
Jan Michel [Fri, 20 Dec 2013 15:14:12 +0000 (16:14 +0100)]
added flag for single-bit fields to get.pl

11 years agobit toggle: depend on attribute not on unicode symbol
Philipp Klaus [Fri, 20 Dec 2013 15:17:17 +0000 (16:17 +0100)]
bit toggle: depend on attribute not on unicode symbol

11 years agoeasily toggle single bits
Philipp Klaus [Fri, 20 Dec 2013 15:07:17 +0000 (16:07 +0100)]
easily toggle single bits

11 years agofew changes to Mvd ROC registers
Maps [Fri, 20 Dec 2013 15:03:44 +0000 (16:03 +0100)]
few changes to Mvd ROC registers

11 years agoused
ECal Group [Fri, 20 Dec 2013 12:12:20 +0000 (13:12 +0100)]
used

11 years agoused
ECal Group [Fri, 20 Dec 2013 12:08:57 +0000 (13:08 +0100)]
used

11 years agoEmpty Plot fixed
Manuel Penschuck [Thu, 19 Dec 2013 20:05:39 +0000 (21:05 +0100)]
Empty Plot fixed

11 years ago-> CTS GUI moved into a dedicated directory and depedencies (CSS/JS files renamed)
Manuel Penschuck [Thu, 19 Dec 2013 19:58:21 +0000 (20:58 +0100)]
-> CTS GUI moved into a dedicated directory and depedencies (CSS/JS files renamed)
-> Ability to set labels for input channels

11 years ago added read back all option
Michael Wiebusch [Thu, 19 Dec 2013 18:52:13 +0000 (19:52 +0100)]
 added read back all option

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Michael Wiebusch [Thu, 19 Dec 2013 18:50:20 +0000 (19:50 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years ago added read back all option
Michael Wiebusch [Thu, 19 Dec 2013 18:50:13 +0000 (19:50 +0100)]
 added read back all option

11 years agoadded caching function
Jan Michel [Thu, 19 Dec 2013 10:22:12 +0000 (11:22 +0100)]
added caching function

11 years agochanged default address for MVD
Jan Michel [Thu, 19 Dec 2013 10:21:22 +0000 (11:21 +0100)]
changed default address for MVD

11 years agominor fix
Michael Wiebusch [Thu, 19 Dec 2013 10:06:37 +0000 (11:06 +0100)]
minor fix

11 years agorearranged CbController.xml, added some more descriptions
Michael Wiebusch [Thu, 19 Dec 2013 10:05:08 +0000 (11:05 +0100)]
rearranged CbController.xml, added some more descriptions

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
Michael Wiebusch [Thu, 19 Dec 2013 09:38:44 +0000 (10:38 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

11 years agofixed xml-db js
Maps [Wed, 18 Dec 2013 17:36:39 +0000 (18:36 +0100)]
fixed xml-db js

11 years agorearranged CbController.xml
Michael Wiebusch [Wed, 18 Dec 2013 13:48:14 +0000 (14:48 +0100)]
rearranged CbController.xml

11 years agoadded units for CB DACs
Maps [Wed, 18 Dec 2013 13:06:33 +0000 (14:06 +0100)]
added units for CB DACs

11 years agoadded checkboxes to enable rates and a future cache system
Jan Michel [Tue, 17 Dec 2013 10:50:48 +0000 (11:50 +0100)]
added checkboxes to enable rates and a future cache system

11 years agofixed length of uC_regs in CbController.xml
Michael Wiebusch [Tue, 17 Dec 2013 09:59:22 +0000 (10:59 +0100)]
fixed length of uC_regs in CbController.xml

11 years agofix/update
Michael Wiebusch [Tue, 17 Dec 2013 09:53:06 +0000 (10:53 +0100)]
fix/update

11 years agoupdated CbController.xml
Michael Wiebusch [Tue, 17 Dec 2013 09:50:23 +0000 (10:50 +0100)]
updated CbController.xml

11 years agochanged default address in cb_controller.pl
Michael Wiebusch [Tue, 17 Dec 2013 09:31:47 +0000 (10:31 +0100)]
changed default address in cb_controller.pl

11 years agoadded rate view to TDC xml-based.
Jan Michel [Mon, 16 Dec 2013 16:09:23 +0000 (17:09 +0100)]
added rate view to TDC xml-based.

11 years agoadded rate function to xml-db
Jan Michel [Mon, 16 Dec 2013 15:01:33 +0000 (16:01 +0100)]
added rate function to xml-db

11 years agoupdated XML for converter board FPGA registers
Philipp Klaus [Mon, 16 Dec 2013 13:24:11 +0000 (14:24 +0100)]
updated XML for converter board FPGA registers

11 years agonxyter register
Ludwig Maier [Sun, 15 Dec 2013 17:31:25 +0000 (18:31 +0100)]
nxyter register

11 years agohadplot -noraise option added to gnuplot command
Ludwig Maier [Sat, 14 Dec 2013 12:14:11 +0000 (13:14 +0100)]
hadplot -noraise option added to gnuplot command

11 years agoMerge branch 'master' of jspc29:/daqtools
Philipp Klaus [Fri, 13 Dec 2013 18:29:10 +0000 (19:29 +0100)]
Merge branch 'master' of jspc29:/daqtools