Commit Graph

Select branches

Hide Pull Requests

10.0.1.rc

1001/python_cmd_for_ROI

802/anna_fixes

802/fix_hdf5_fillvalue

anna

ctbgatedclk

debugInterpolation

dev/add_simulator_tests_in_github_workflows

dev/add_simulator_tests_in_github_workflows_fix

dev/automate_documentation_build

dev/dbitorder

dev/fix/test_frame_synchronizer_write_error_to_log_file

dev/fix_m3_hdf5_master_file_time_arrays

dev/generate

dev/xilinx_power

developer

fix/const

fix/pattern

fix/pyfixture_test

fix/remove-writeDataFile

fix/setbit_not_backwardscompatible_in_python

g2rxrgui

gh-pages

jf_h5reader

jf_json_rxroi

kp_highZ

main

moench

moench8.0.2.rc

patrick_250211

rosenblatt

rr_rxr

separateRxr

split-listener

#1

#10

#100

#1000

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#101

#1010

#1011

#1013

#1014

#1015

#1017

#1018

#1019

#102

#1020

#1023

#1024

#1025

#1027

#1029

#103

#1030

#1031

#1034

#1037

#1038

#1039

#104

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#105

#1050

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1064

#1065

#1066

#1069

#107

#1071

#1074

#1076

#1078

#1079

#108

#1082

#1084

#1086

#1089

#109

#1090

#1092

#1093

#1094

#1096

#1097

#1098

#1099

#11

#110

#1100

#1101

#1106

#1107

#1108

#111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1119

#112

#1120

#1123

#1125

#1126

#1127

#113

#1130

#1131

#1133

#1136

#1137

#114

#1140

#1141

#1142

#1143

#1145

#1148

#1149

#115

#1157

#1158

#1159

#116

#1162

#1163

#1164

#1165

#1167

#117

#1176

#1177

#1178

#1179

#118

#1181

#1184

#1186

#1188

#1189

#1190

#1193

#1194

#1195

#1199

#12

#120

#1200

#1201

#1202

#1205

#1206

#1207

#1209

#121

#1211

#1212

#1213

#1214

#1215

#1216

#1217

#1219

#122

#1221

#1223

#1224

#1225

#1226

#1227

#1228

#123

#1230

#1232

#1233

#1237

#1239

#124

#1242

#1245

#1247

#125

#1250

#1252

#1253

#1255

#1256

#1257

#1258

#1259

#126

#1260

#1262

#1263

#1264

#1265

#1266

#1267

#1268

#1269

#127

#1271

#1272

#1273

#1274

#1275

#1276

#1277

#1278

#1279

#128

#1280

#1281

#1282

#1285

#1286

#1287

#1289

#129

#1290

#1291

#1292

#1293

#1294

#1295

#1298

#1299

#13

#1301

#1303

#1306

#1307

#1309

#1311

#1312

#1313

#1315

#1316

#1318

#1320

#1321

#1324

#1326

#1327

#1328

#1330

#1332

#1333

#1335

#1337

#1337

#1338

#1339

#1342

#1343

#1344

#1346

#1346

#1347

#1348

#1348

#1350

#1350

#1351

#1352

#1353

#1353

#1355

#1355

#1357

#1357

#1358

#1358

#1359

#14

#140

#141

#147

#149

#15

#150

#152

#156

#157

#159

#16

#163

#164

#166

#167

#168

#17

#170

#171

#173

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#186

#188

#189

#19

#190

#191

#193

#196

#199

#2

#20

#200

#201

#203

#204

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#218

#22

#221

#222

#223

#225

#226

#227

#228

#229

#23

#231

#232

#235

#237

#24

#242

#246

#247

#248

#25

#250

#252

#254

#256

#259

#26

#264

#265

#267

#268

#269

#27

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#329

#33

#330

#331

#332

#333

#334

#335

#339

#34

#340

#343

#344

#346

#347

#349

#35

#354

#355

#357

#358

#359

#36

#361

#362

#368

#37

#371

#373

#375

#376

#378

#379

#38

#384

#386

#388

#39

#390

#391

#395

#396

#397

#398

#4

#40

#401

#407

#408

#409

#41

#411

#413

#414

#418

#419

#42

#420

#421

#423

#425

#427

#428

#429

#43

#430

#431

#435

#436

#439

#44

#440

#443

#444

#445

#447

#449

#45

#450

#452

#453

#454

#457

#46

#460

#461

#462

#463

#464

#465

#466

#47

#470

#475

#477

#479

#48

#480

#481

#482

#483

#484

#485

#487

#49

#490

#492

#493

#495

#496

#498

#499

#50

#501

#502

#503

#504

#505

#506

#507

#508

#51

#510

#512

#514

#516

#518

#519

#52

#521

#522

#524

#526

#53

#535

#536

#54

#541

#542

#544

#545

#547

#548

#55

#550

#551

#552

#553

#554

#555

#556

#557

#559

#56

#560

#561

#562

#563

#565

#566

#567

#568

#569

#57

#570

#571

#573

#574

#576

#577

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#590

#591

#594

#595

#596

#597

#6

#60

#601

#602

#603

#604

#606

#609

#61

#613

#615

#618

#619

#62

#620

#621

#623

#625

#628

#629

#63

#632

#636

#637

#638

#639

#64

#642

#643

#644

#646

#647

#649

#65

#653

#655

#656

#658

#659

#66

#662

#665

#667

#669

#67

#673

#674

#68

#680

#681

#683

#684

#685

#686

#687

#688

#69

#690

#691

#693

#694

#696

#697

#698

#699

#7

#70

#700

#701

#702

#703

#705

#706

#708

#709

#71

#710

#713

#714

#715

#716

#717

#719

#72

#721

#722

#723

#724

#725

#726

#728

#729

#73

#731

#732

#736

#737

#738

#739

#74

#740

#741

#742

#743

#745

#746

#747

#75

#750

#751

#753

#755

#756

#757

#759

#76

#761

#764

#766

#767

#768

#769

#770

#772

#773

#774

#775

#776

#777

#779

#780

#782

#784

#786

#787

#788

#789

#79

#790

#791

#792

#794

#796

#797

#8

#80

#802

#803

#805

#807

#81

#810

#812

#813

#814

#815

#816

#817

#818

#819

#82

#820

#821

#822

#823

#824

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#84

#841

#842

#846

#847

#848

#85

#850

#851

#852

#853

#854

#855

#856

#857

#859

#86

#860

#861

#862

#864

#865

#866

#867

#869

#87

#870

#871

#872

#873

#875

#876

#877

#878

#879

#88

#880

#881

#882

#884

#886

#887

#888

#89

#891

#892

#893

#895

#898

#9

#90

#900

#901

#907

#908

#909

#91

#910

#911

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#931

#933

#935

#936

#94

#940

#942

#943

#944

#946

#947

#948

#949

#95

#951

#952

#953

#954

#956

#957

#958

#959

#96

#960

#962

#963

#966

#968

#969

#97

#970

#972

#973

#974

#975

#979

#98

#980

#982

#983

#985

#987

#988

#99

#990

#991

#992

#993

#994

#995

#996

#999

10.0.0

2.0.5

2.1.0

2.1.1

2.2.0

2.3.0

2.3.1

2.3.2

2.3.3

2.3.4

2020.03.02.dev0

2020.03.06.dev0

2020.03.11.dev0

2020.03.17dev0

2020.03.18dev0

2020.03.18dev1

2020.03.18dev2

2020.04.01.dev0

2020.04.07.dev0

2020.04.08.dev0

2020.04.08.dev1

2020.04.23.dev0

2020.05.08.dev0

2020.06.08.dev0

2020.07.23.dev0

2020.08.10.dev0

2020.08.12.dev0

2020.09.09.dev0

2020.09.11.dev0

2020.09.17.dev0

2020.09.24.dev0

2020.09.24.dev1

2020.09.25.dev0

2020.10.05.dev0

2020.10.12.dev0

2020.10.28.dev0

2020.11.02.dev0

2020.11.09.dev0

2020.11.09.dev1

2021.01.14.dev0

2021.01.20.dev0

2021.01.26.dev0

2021.5.10.dev0

2022.04.04.dev0

2022.05.10.dev0

2022.05.10.dev1

2022.05.12.dev0

2022.05.22.dev0

2022.06.07.dev0

2022.07.06.dev0

2022.2.23.dev0

2022.2.3.dev0

2023.03.13.dev0

2023.03.16.dev1

3.0.0

3.0.1

3.1.0

3.1.1

3.1.2

3.1.3

3.1.4

3.1.5

4.0.0

4.0.1

4.0.2

4.1.0

4.1.1

4.2.0

5.0.0

5.0.0-rc1

5.0.0-rc2

5.0.0.rc2

5.0.1

5.1.0

5.1.0.rc1

5.1.0.rc2

5.1.0.rc3

6.0.0

6.0.0-rc1

6.1.0

6.1.1

6.1.2

7.0.0

7.0.0.rc1

7.0.0.rc2

7.0.0.rc3

7.0.0.rc4

7.0.1

7.0.2

7.0.3

8.0.0

8.0.1

8.0.2

9.0.0

9.1.0

9.1.1

9.2.0

ctb1.0

gotthardDoubleModule

jungfrau_draft_2.0

moenchv0.1

olddeveloper

sophieesrf

Mono Color

• 9b81143c68 Merge branch 'ctbFixes' into refactor Dhanya Thattil 2019-02-22 13:58:51 +01:00
• 20edf61e30 ctb server: removed unnecessary prints, resulting in a bug fix for slow adc temp Dhanya Thattil 2019-02-22 13:53:59 +01:00
• a1a6a5dbaa ctb server: slow adc temp fixed Dhanya Thattil 2019-02-22 13:22:40 +01:00
• a8121ae108 ctb server: vio should be off at start up Dhanya Thattil 2019-02-22 09:03:30 +01:00
• 40d15264c5 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-02-21 16:25:07 +01:00
• b2e6b78e20 Merge branch 'ctbBugFixes' into refactor Dhanya Thattil 2019-02-21 16:24:56 +01:00
• f5244faa02 moench: adding enums for zmq parameters, needs modification in naming Dhanya Thattil 2019-02-21 16:01:24 +01:00
• 421dbdb9b5 ctb server: including moench as well for programfpga and other client ctb implementations Dhanya Thattil 2019-02-21 16:00:40 +01:00
• 617f3d2600 ctb server: modified program fpag in case of errors Dhanya Thattil 2019-02-21 15:56:51 +01:00
• a4f1b7670f ctb server bug fixes:update client, get period left, getid(api and serial number), restrict setting vchip, allow write adc Dhanya Thattil 2019-02-21 09:37:49 +01:00
• 09546a8632 ctb server: - allowed flags resetfpga and programfpga for moench and ctb - set a minimum voltage for vio as it powers the fpga (1200mV) - changed the min and max for vchip and power regulators due to tolerance - fixed pattern read function - fixed minor bugs with input of ctb patterns(waittime) and mode other than 1 - fixed calibration current register for i2c for tolerance (/1.2268) - fixed current readout of i2c - added digital, analog and normal readouts for flags Dhanya Thattil 2019-02-20 15:36:34 +01:00
• 29d4eb8b41 catch by ref Erik Frojdh 2019-02-20 10:29:15 +01:00
• 775bde76c9 ctb server: power regulator adjusted for precision Dhanya Thattil 2019-02-20 09:34:55 +01:00
• d876cb6da6 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-02-20 08:47:13 +01:00
• 69f361468e ctb: power regulators (set dac, get dac, get adc of voltage and current) works Dhanya Thattil 2019-02-20 08:45:34 +01:00
• b52c6b05b8 link and format Erik Frojdh 2019-02-16 16:46:09 +01:00
• c93f88b7e5 ctb server: fixed dacs, power regulators and vchip Dhanya Thattil 2019-02-15 17:08:49 +01:00
• d0e1289c1b replaced sprintf on the same buffer with strcat Erik Frojdh 2019-02-15 15:39:13 +01:00
• 4a8a72c447 ctb server: vlimit not impl, adc in degrees Dhanya Thattil 2019-02-14 18:28:32 +01:00
• 501c579f6b users: added json parameter for moench api Dhanya Thattil 2019-02-14 18:03:49 +01:00
• 722883531d reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings Dhanya Thattil 2019-02-14 17:43:28 +01:00
• d2ba206216 Merge branch 'findzmq' into refactor Dhanya Thattil 2019-02-14 17:35:07 +01:00
• 6be47d936f conflicts resolved Dhanya Thattil 2019-02-14 17:32:33 +01:00
• 9aaca14b01 CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers) Dhanya Thattil 2019-02-14 16:15:43 +01:00
• aaae6d854c changed remaining cmake options to have SLS_ prefix Dhanya Thattil 2019-02-14 15:42:04 +01:00
• c91c2c224a Merge branch 'add-cmake-packages' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-cmake-packages Dhanya Thattil 2019-02-14 10:36:41 +01:00
• 2fdfd33f97 gitignore: added .o files for the servers Dhanya Thattil 2019-02-14 09:30:50 +01:00
• 230b26a680 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-02-13 20:19:16 +01:00
• 46aa7769cc client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future Dhanya Thattil 2019-02-13 20:19:08 +01:00
• 59f3f0c764 cleaner cmake Erik Frojdh 2019-02-13 15:59:42 +01:00
• d46d96ecca fixed linking zmq Erik Frojdh 2019-02-13 15:35:40 +01:00
• 82584dd1a8 cmake Erik Frojdh 2019-02-13 15:13:21 +01:00
• b65e0a1f01 include dirs Erik Frojdh 2019-02-13 15:12:33 +01:00
• f9417a23e0 FindZeroMq Erik Frojdh 2019-02-13 14:53:23 +01:00
• fd95550724 client: fix for json header values being integer Dhanya Thattil 2019-02-13 12:43:56 +01:00
• c064dc84ae Add generation and install of CMake packages Samuel Debionne 2019-02-11 13:56:48 +01:00
• 01e3cb8d5e Cherry pick commit from 4.0.1 about CMake packages Samuel Debionne 2019-02-11 13:46:00 +01:00
• c6ac0f8ebc Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-02-13 09:37:45 +01:00
• f9be8b89ac added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration Dhanya Thattil 2019-02-13 09:37:31 +01:00
• 75a75b6cf6 Merge pull request #3 from esrf-bliss/add-slsReceiver-ctor-overload Dhanya Thattil 2019-02-13 09:10:33 +01:00
• f125b94a7d Use sls::make_unique<> Samuel Debionne 2019-02-13 08:59:26 +01:00
• b18391330e Add slsReceiverUsers(int tcpip_port_no) overload Use std::unique_ptr<> instead of raw pointers Samuel Debionne 2019-02-12 16:23:55 +01:00
• 2bcf88e434 added receiverUsers as public header Erik Frojdh 2019-02-12 15:26:08 +01:00
• d7ce5fedfd path Erik Frojdh 2019-02-12 15:06:15 +01:00
• 3a2682ffe7 missing headers updated build number Erik Frojdh 2019-02-12 14:46:56 +01:00
• 031a11c4f7 removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench) Dhanya Thattil 2019-02-12 11:09:19 +01:00
• a64b34610a merge from developer (without the additional json header implementations) Dhanya Thattil 2019-02-12 09:35:24 +01:00
• ed74e710d6 merge from 4.0.1 Dhanya Thattil 2019-02-11 14:37:54 +01:00
• 907d1655d1 merge from 4.0.1 Dhanya Thattil 2019-02-11 14:04:09 +01:00
• bf74a4135e travis Erik Frojdh 2019-02-11 10:25:58 +01:00
• 252ecf2769 travis Erik Frojdh 2019-02-11 10:15:57 +01:00
• de01ab75e9 travis Erik Frojdh 2019-02-11 09:24:39 +01:00
• a7ba5eb0d8 updated release.txt Dhanya Thattil 2019-02-08 17:46:13 +01:00
• 6bf1a944da updaterev Dhanya Thattil 2019-02-08 17:28:44 +01:00
• 3c77447868 removed minor warnings Dhanya Thattil 2019-02-08 16:32:23 +01:00
• 046fb11e5e Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Dhanya Thattil 2019-02-08 16:02:15 +01:00
• b89d56001e CMake: prefixing the options with SLS_ Dhanya Thattil 2019-02-08 16:02:05 +01:00
• de204dee38 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Erik Frojdh 2019-02-08 14:03:56 +01:00
• 0ef030354f warning Erik Frojdh 2019-02-08 14:03:49 +01:00
• dccce9bf55 Merge branch 'esrf-bliss-add-targets-export-name' into 4.0.1-rc Dhanya Thattil 2019-02-08 13:09:06 +01:00
• 441c3dc5db Merge branch 'add-targets-export-name' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-targets-export-name Pull request from Samuel ESRF Dhanya Thattil 2019-02-08 13:07:08 +01:00
• afd9e29424 updated release.txt to have eriks bug fix for receiver gap pixels enable in reciever Dhanya Thattil 2019-02-08 12:53:58 +01:00
• ce939b3cd6 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Dhanya Thattil 2019-02-08 12:45:45 +01:00
• 0984654fd0 updated release.txt Dhanya Thattil 2019-02-08 12:33:04 +01:00
• cd738106ec printf and uninitialized variables Erik Frojdh 2019-02-08 11:14:16 +01:00
• 0e120330f4 fixed comparisons to build with clang Erik Frojdh 2019-02-08 10:16:32 +01:00
• 985b2eba4d ctb registers updated Dhanya Thattil 2019-02-07 18:05:15 +01:00
• bf0e0ac601 updated binaries in serverbin Dhanya Thattil 2019-02-07 17:06:07 +01:00
• 143682cfb1 updaterev Dhanya Thattil 2019-02-07 16:55:01 +01:00
• a5ee9fbdba ctb bug fixes: pattern generator, vchip, dacs Dhanya Thattil 2019-02-07 16:51:18 +01:00
• 166541bd15 ctb adc phase get fix Dhanya Thattil 2019-02-06 19:05:11 +01:00
• 140996fae6 ctb adc fix, update detector fix, acq error fix Dhanya Thattil 2019-02-06 18:50:50 +01:00
• 3f43767d38 ctb client updated Dhanya Thattil 2019-02-06 17:45:19 +01:00
• a76cc90972 adc command line bug, ctb api added to client Dhanya Thattil 2019-02-06 17:25:36 +01:00
• 0c1a3b7756 eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16 Dhanya Thattil 2019-02-06 17:07:13 +01:00
• 18ab437ae5 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer olddeveloper Anna Bergamaschi 2019-02-06 16:30:59 +01:00
• 3b56091e2f new header for raw files Anna Bergamaschi 2019-02-06 16:30:37 +01:00
• dcad6c80ce minor modifications for interpolation and mythe data structure Anna Bergamaschi 2019-02-06 16:22:17 +01:00
• 076faa62e0 ctb server: server starts up good. Need to debug each function in detail Dhanya Thattil 2019-02-06 15:50:44 +01:00
• 22686e1e25 eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10 Dhanya Thattil 2019-02-06 14:49:00 +01:00
• bb37915419 stdexcept added to compile Dhanya Thattil 2019-02-05 14:44:49 +01:00
• e13ecc8625 Add slsReceiver and slsDetector targets to the export set (used by donwstream project) Samuel Debionne 2018-09-07 10:55:03 +02:00
• ef3e01b9bd Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Dhanya Thattil 2019-02-05 10:49:46 +01:00
• dffa4d9de5 eiger manual Gemma Tinti 2019-02-05 10:46:37 +01:00
• dfca81208b manual acq: uncomment insignificant Dhanya Thattil 2019-02-05 10:36:33 +01:00
• 37be7d0e2b manual acq config added Dhanya Thattil 2019-02-04 17:54:58 +01:00
• 49812a34ae manual acq changes for debugging Dhanya Thattil 2019-02-04 17:31:58 +01:00
• 133b82ad61 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Dhanya Thattil 2019-02-04 16:43:44 +01:00
• 61e769773b got rid of insignificant printouts from debugging Dhanya Thattil 2019-02-04 16:43:37 +01:00
• 23dce681b2 added clang format and clang tidy from refactor Erik Frojdh 2019-02-04 14:11:06 +01:00
• 6abfdcb2c8 manual Gemma Tinti 2019-02-04 10:48:42 +01:00
• 7481c7f0e6 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc Dhanya Thattil 2019-02-01 18:50:08 +01:00
• 3c2bbf6ad4 gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes, multi: possible fix of image reconstruction in x direction in gui Dhanya Thattil 2019-02-01 18:48:25 +01:00
• b8fec6c050 gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes Dhanya Thattil 2019-02-01 18:48:25 +01:00
• 2f11681d3f gotthard server: configmac should also set cycles for sending dummy frame Dhanya Thattil 2019-01-30 18:24:25 +01:00
• 12f8166d25 manual acq changed config file, added some changes for jungfrau that aren;t tested, but soleil acq test passed Dhanya Thattil 2019-01-29 15:49:41 +01:00
• 536c853d79 hack for receiver port Erik Frojdh 2019-01-25 19:41:33 +01:00
• f1d055138c moved updateDetector/Receiver Erik Frojdh 2019-01-25 19:12:28 +01:00
• 82ce6b639c more cout Erik Frojdh 2019-01-25 16:53:19 +01:00
• 7d9417dffe fixed debug couts Erik Frojdh 2019-01-25 16:48:04 +01:00