Commits · master · Jeremy Andrea / Ph2_ACF

10 Dec, 2018 1 commit
- Solved bug in Utils/D19cCbc3Event.h:calculate_address · 744d3973
  Lorenzo Uplegger authored Dec 10, 2018
  
  744d3973
13 Feb, 2018 3 commits
- merged Dev Branch with all CBC3 features · ddd7bd52
  Georg Auzinger authored Feb 13, 2018
  
  ddd7bd52
- updated README and CHANGELOG for release v.1-50 · 54a34755
  Georg Auzinger authored Feb 13, 2018
  
  54a34755
- Merge branch 'fc7daq' into 'Dev' · 1ab9591c
  Georg Auzinger authored Feb 13, 2018
```
address tables fix

See merge request cms_tk_ph2/Ph2_ACF!76
```
  1ab9591c
12 Feb, 2018 4 commits
- Merge remote-tracking branch 'upstream/Dev' into fc7daq · c0e1a3dc
  Mykyta Haranko authored Feb 12, 2018
  
  c0e1a3dc
- important updated of the address table and config files · d84e034a
  Mykyta Haranko authored Feb 12, 2018
  
  d84e034a
- Merge branch 'fc7daq' into 'Dev' · 2ba9e151
  Georg Auzinger authored Feb 12, 2018
```
2xCBC3 stable (the most recent firmware)

See merge request cms_tk_ph2/Ph2_ACF!75
```
  2ba9e151
- cmakelists should probably be c++11, not all the people have c++14 compliant compiler · 429c8a16
  Mykyta Haranko authored Feb 12, 2018
  
  429c8a16
11 Feb, 2018 1 commit
- fix of the address table for clokc sources · c3d2801b
  Mykyta Haranko authored Feb 11, 2018
  
  c3d2801b
09 Feb, 2018 3 commits
- Merge branch 'mpa_ssa_dev' into 'fc7daq' · 56d042ec
  Mykyta Haranko authored Feb 09, 2018
```
Mpa ssa dev

See merge request myharank/Ph2_ACF!1
```
  56d042ec
- merging mpa i2c master and cbc i2c master · 25c9da0e
  Mykyta Haranko authored Feb 09, 2018
  
  25c9da0e
- Merge branch 'fc7daq' into mpa_ssa_dev · bdd51e1b
  Mykyta Haranko authored Feb 09, 2018
  
  bdd51e1b
24 Jan, 2018 1 commit
- Merge remote-tracking branch 'origin/fc7daq' into ddr3_dev · c50bd8f2
  Mykyta Haranko authored Jan 24, 2018
```
Conflicts:
	HWInterface/D19cFWInterface.cc
	settings/address_tables/d19c_address_table.xml
```
  c50bd8f2
23 Jan, 2018 1 commit
- small fix of the stub counters · 0b7baac0
  Mykyta Haranko authored Jan 23, 2018
  
  0b7baac0
22 Jan, 2018 1 commit
- cluster overflow warning added · 7a60932f
  Mykyta Haranko authored Jan 22, 2018
  
  7a60932f
17 Jan, 2018 1 commit
- i2c commands for new d19c i2c master (dev!!) · 614067b0
  Mykyta Haranko authored Jan 17, 2018
  
  614067b0
13 Dec, 2017 1 commit
- new implementation of the phase tuning (more status registers) · 33d989f9
  Mykyta Haranko authored Dec 13, 2017
  
  33d989f9
05 Dec, 2017 4 commits
- updated d19c description · bae7a8a2
  Mykyta Haranko authored Dec 05, 2017
  
  bae7a8a2
- Merge remote-tracking branch 'upstream/Dev' into fc7daq · 18de9dbf
  Mykyta Haranko authored Dec 05, 2017
  
  18de9dbf
- merging upstream · 910cc19b
  Lorenzo Uplegger authored Dec 04, 2017
  
  910cc19b
- fixed condition data and updated FNAL settings file · 36a1ecb2
  Lorenzo Uplegger authored Dec 04, 2017
  
  36a1ecb2
04 Dec, 2017 5 commits
- fixed really subtle bug with condition data creation · 9cc4fca7
  Georg Auzinger authored Dec 04, 2017
  
  9cc4fca7
- removed const from BeBoard in Event::getSLinkEvent to update cond data · e4411184
  Basil Schneider authored Dec 03, 2017
  
  e4411184
- removed const from BeBoard in Event::getSLinkEvent() · 452b31a4
  Georg Auzinger authored Dec 04, 2017
  
  452b31a4
- Update BeBoard.cc · 5c5ff415
  Georg Auzinger authored Dec 04, 2017
  
  5c5ff415
- Update BeBoard.h - remove const from updateCondData · c1beb9b0
  Georg Auzinger authored Dec 04, 2017
  
  c1beb9b0
03 Dec, 2017 2 commits
- changes for new FW · 2f7dbdba
  Basil Schneider authored Dec 03, 2017
  
  2f7dbdba
- latest version of D19C Interface and config file for FNAL running · fac40408
  Basil Schneider authored Dec 02, 2017
  
  fac40408
02 Dec, 2017 1 commit
- some bugfixes and updated D19C FW Interface · 9e069912
  Basil Schneider authored Dec 01, 2017
  
  9e069912
01 Dec, 2017 1 commit
- updated D19C FW Interface to remove all resets and hava non blocking version... · 02b11648
  Basil Schneider authored Dec 01, 2017
```
updated D19C FW Interface to remove all resets and hava non blocking version for the D19C supervisor - also fixing the config file
```
  02b11648
30 Nov, 2017 2 commits
- few minor changes and added setup_ots.sh · 5e4d146c
  Computing Division authored Nov 30, 2017
  
  5e4d146c
- Fix compiler warnings · 2a6a9426
  Lorenzo Uplegger authored Nov 30, 2017
  
  2a6a9426
28 Nov, 2017 2 commits
- added config file for FNAL testbeam · f6f866a9
  Georg Auzinger authored Nov 28, 2017
  
  f6f866a9
- Merge remote-tracking branch 'upstream/Dev' into Dev · 893535ed
  Basil Schneider authored Nov 27, 2017
  
  893535ed
24 Nov, 2017 4 commits
- Merge remote-tracking branch 'upstream/Dev' into fc7daq · 541cad9f
  Mykyta Haranko authored Nov 24, 2017
  
  541cad9f
- Merge branch 'Dev' of https://gitlab.cern.ch/cms_tk_ph2/Ph2_ACF into Dev · 0987f639
  Georg Auzinger authored Nov 24, 2017
  
  0987f639
- removed unnecessary output from fpgaconfig · 36748341
  Georg Auzinger authored Nov 24, 2017
  
  36748341
- Small modification to D19C interface to fix misleading warnings in ReadData.... · fd4644a4
  Sarah Seif El Nasr authored Nov 24, 2017
```
Small modification to D19C interface to fix misleading warnings in ReadData. Added 2D latency scan which identifies optimal trigger and stub latency.
```
  fd4644a4
23 Nov, 2017 2 commits
- tools/SignalScan.cc · 92744d10
  Sarah Seif El Nasr authored Nov 23, 2017
```
Modified SignalScan to now also count stubs per CBC. And modified D19cFWInterface to try and be smarter about when to reset the DAQ in ReadData.
```
  92744d10
- Added some useful masking methods to Tool.h and a method to decode the bend LUT from the CBC3. · 6d50af00
  Sarah Seif El Nasr authored Nov 23, 2017
  
  6d50af00