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

• dc16d52d49 switching off gui, and acqire should work Dhanya Maliakal 2016-10-07 10:21:22 +02:00
• 59f3aef703 back to subscriber publisher Dhanya Maliakal 2016-10-07 10:15:19 +02:00
• b1dde586e1 back to subscriber publisher Dhanya Maliakal 2016-10-07 10:15:12 +02:00
• cce93ebbcf removing the check for receiver to update data threads upon configuration Dhanya Maliakal 2016-10-07 07:54:26 +02:00
• e6db70354c thread starting if rxr closed and others Dhanya Maliakal 2016-10-06 15:50:11 +02:00
• ed8a779f7f thread starting if rxr closed and others Dhanya Maliakal 2016-10-06 15:50:02 +02:00
• 6f6199ad20 moved created socket outside innner and outer loop Dhanya Maliakal 2016-10-06 14:43:56 +02:00
• 54b78363b0 enabling datastream back to qdrawplot Dhanya Maliakal 2016-10-06 14:22:08 +02:00
• 65acd118c5 looks done Dhanya Maliakal 2016-10-06 13:51:23 +02:00
• c5e7d44b15 looks done Dhanya Maliakal 2016-10-06 13:49:40 +02:00
• 2fdc4389e2 Merge branch '2.1' into 2.1.1-rc Dhanya Maliakal 2016-10-06 08:51:06 +02:00
• 5082435501 fixed bug in gui that overwrites the individual sls file path values with the multi value Dhanya Maliakal 2016-10-06 08:50:08 +02:00
• de2de6315c somewhere Dhanya Maliakal 2016-10-06 08:44:00 +02:00
• 723df0e9fb somewhere Dhanya Maliakal 2016-10-06 08:43:14 +02:00
• 09e8bf4144 somewhere Dhanya Maliakal 2016-10-05 15:27:25 +02:00
• 6da59ca382 somewhere, but weird threads Dhanya Maliakal 2016-10-05 15:26:58 +02:00
• bf54c15560 updated to have activate function implemented Dhanya Maliakal 2016-10-05 09:30:08 +02:00
• 489b623afd trying to get in changes for activate in receiver Dhanya Maliakal 2016-10-05 08:24:35 +02:00
• 39a1f16b33 Merge branch '2.1.1-rc' into developer Dhanya Maliakal 2016-10-04 15:16:04 +02:00
• 94667c5dde got rif of unnecessary usleep in lisetning Dhanya Maliakal 2016-10-04 15:15:08 +02:00
• 39baeade37 Merge branch 'developer' into zmqdata Dhanya Maliakal 2016-10-04 14:43:31 +02:00
• 13cff71faf got rid of activate function definition redeclaration in receiver funcs Dhanya Maliakal 2016-10-04 14:43:02 +02:00
• 9cfd914a3e Merge branch '2.1.1-rc' into developer Dhanya Maliakal 2016-10-04 14:35:19 +02:00
• f6b7fd7aa3 merged thread error fix from developer Dhanya Maliakal 2016-10-04 14:29:25 +02:00
• 7ead69a761 merged with developer after it merged with 2.1.1-rc(deactivate) Dhanya Maliakal 2016-10-04 14:10:52 +02:00
• a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver Dhanya Maliakal 2016-10-04 14:06:47 +02:00
• 984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep Dhanya Maliakal 2016-10-04 13:36:04 +02:00
• 2a4bd8022e works for deactivated server and receiver Dhanya Maliakal 2016-10-04 07:36:00 +02:00
• 0979d04693 works for deactivated server and receiver Dhanya Maliakal 2016-10-04 07:35:52 +02:00
• 1aec6a71a1 Merge branch '2.1' into developer Dhanya Maliakal 2016-09-30 15:13:34 +02:00
• 572047b72d was making 3 threads for each set detector type command, because it created standard receiver object each time Dhanya Maliakal 2016-09-30 15:13:12 +02:00
• f513fb06fb switching the gpio definitions into function implementation Dhanya Maliakal 2016-09-30 07:56:54 +02:00
• dcee737faf documentation Gemma Tinti 2016-09-29 15:45:43 +02:00
• d3c4d52118 updaterev Dhanya Maliakal 2016-09-29 10:29:48 +02:00
• 01ed24263f updaterev Dhanya Maliakal 2016-09-29 10:29:24 +02:00
• 5ae3522028 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Dhanya Maliakal 2016-09-29 10:28:37 +02:00
• 813b7ba6e7 added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits Dhanya Maliakal 2016-09-29 10:28:27 +02:00
• c093da38ae updaterev Dhanya Maliakal 2016-09-29 08:29:39 +02:00
• 4b7743b8ad update manual Gemma Tinti 2016-09-28 14:25:24 +02:00
• 8a80cb489d change server with new boundary for counts above teh max Gemma Tinti 2016-09-27 20:47:59 +02:00
• 5c81abdce0 jungfrau programming change Dhanya Maliakal 2016-09-26 12:00:23 +02:00
• 5f4a4b0d90 maybe fixed 16 bit rate corr eiger Dhanya Maliakal 2016-09-23 17:15:16 +02:00
• 1b61e10e36 forgot to add eiger binary Dhanya Maliakal 2016-09-23 14:32:21 +02:00
• d904f7b32e adding 16 bit rate correction in eiger Dhanya Maliakal 2016-09-23 14:28:20 +02:00
• c678199802 Merge branch '2.1-rc' into developer Dhanya Maliakal 2016-09-22 17:19:10 +02:00
• 953e513a2d updatereveiger Dhanya Maliakal 2016-09-22 17:18:35 +02:00
• a7c180eb1c settings initially at UNINITIALIZED in eiger server Dhanya Maliakal 2016-09-22 17:16:49 +02:00
• 44870480be merging for gotthard, not done Dhanya Maliakal 2016-09-22 13:17:17 +02:00
• 1aff36efb8 small print out change Dhanya Maliakal 2016-09-21 16:37:52 +02:00
• d0501c3139 creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc) Dhanya Maliakal 2016-09-21 16:37:29 +02:00
• d6ca7ecbc4 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc Dhanya Maliakal 2016-09-20 15:12:26 +02:00
• a1df8bdc15 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc Dhanya Maliakal 2016-09-20 15:11:39 +02:00
• acb5e50870 Merge branch 'developer' into zmqdata Dhanya Maliakal 2016-09-20 14:42:20 +02:00
• 9f2430cace enablingdatastream name change Dhanya Maliakal 2016-09-20 14:42:01 +02:00
• 7745bf5e0c Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer Dhanya Maliakal 2016-09-20 10:44:11 +02:00
• 8c88de899a added in gitignore to ignore build and tests Dhanya Maliakal 2016-09-20 10:43:59 +02:00
• bdcbdba2ab done with eiger Dhanya Maliakal 2016-09-20 10:42:49 +02:00
• d751c626b3 done with eiger Dhanya Maliakal 2016-09-20 10:42:43 +02:00
• 611f3a26c2 only missing data left to be handled in zmqthread in receiver Dhanya Maliakal 2016-09-19 17:21:28 +02:00
• 904d21d0be only missing data left to be handled in zmqthread in receiver Dhanya Maliakal 2016-09-19 17:21:23 +02:00
• 6a244c1057 bug fixed, rapidjson parse error Dhanya Maliakal 2016-09-19 12:34:38 +02:00
• 38d477a1ad bug fixed, rapidjson parse error Dhanya Maliakal 2016-09-19 12:34:31 +02:00
• 189834bb53 autorcc is not available for cmake 2.8, use manual instead wang_x1 2016-09-19 11:59:47 +02:00
• 82669103af added rapidjson lib Dhanya Maliakal 2016-09-16 17:22:44 +02:00
• 57e741c36c included json example with dummy values Dhanya Maliakal 2016-09-16 17:19:55 +02:00
• f517eb7a41 included json example with dummy values Dhanya Maliakal 2016-09-16 17:19:37 +02:00
• 6abb1d2ae9 included json example with dummy values Dhanya Maliakal 2016-09-16 17:19:29 +02:00
• e9a3310042 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_receiver_software into zmqdata Dhanya Maliakal 2016-09-16 15:41:20 +02:00
• c16f251442 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata Dhanya Maliakal 2016-09-16 15:41:05 +02:00
• 9c8f663b8e done Dhanya Maliakal 2016-09-16 12:49:39 +02:00
• 1263e80d21 done Dhanya Maliakal 2016-09-16 12:49:27 +02:00
• 895dae6d68 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_gui into zmqdata Dhanya Maliakal 2016-09-16 12:48:57 +02:00
• e0dc25905b done Dhanya Maliakal 2016-09-16 12:48:32 +02:00
• 58713a90aa works, need to do json header and send dataready Dhanya Maliakal 2016-09-15 17:16:00 +02:00
• 1da4b07e73 works, need to do json header and send dataready Dhanya Maliakal 2016-09-15 17:15:55 +02:00
• e1604a081f add missing pthread lib wang_x1 2016-09-15 13:59:18 +02:00
• 7d86e62045 almost Dhanya Maliakal 2016-09-15 12:16:08 +02:00
• a821442b1a almosst Dhanya Maliakal 2016-09-15 12:16:01 +02:00
• 0f9a841c4a almost done Dhanya Maliakal 2016-09-15 10:17:16 +02:00
• 7a55866966 manual Gemma Tinti 2016-09-14 17:41:07 +02:00
• a80da4f677 Merge branch 'developer' into cmake Dhanya Maliakal 2016-09-14 14:38:54 +02:00
• 721249231f add missing preprocessor macro wang_x1 2016-09-14 12:03:39 +02:00
• c80b1c9a91 add missing preprossor macros wang_x1 2016-09-14 11:58:39 +02:00
• 33807b7fac Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata Dhanya Maliakal 2016-09-14 10:43:33 +02:00
• 557eccb74d almost there Dhanya Maliakal 2016-09-14 10:42:51 +02:00
• 3ed738b949 almost done Dhanya Maliakal 2016-09-09 17:52:07 +02:00
• 652d29f2d9 almost done Dhanya Maliakal 2016-09-09 17:51:36 +02:00
• 988426dc96 Added adc command for chiptestboard Anna Bergamaschi 2016-09-05 10:49:47 +02:00
• 258e671420 Merge branch 'cmake' into zmqdata Dhanya Maliakal 2016-09-05 10:43:13 +02:00
• 5f6b4c1b79 in between Dhanya Maliakal 2016-09-05 10:09:49 +02:00
• 1044fc68ab Merge branch 'cmake' of git.psi.ch:sls_detectors_software/sls_detectors_package into cmake wang_x1 2016-09-02 16:28:28 +02:00
• 36904db3ca now GUI is compatible with qwt 6.1 wang_x1 2016-09-02 16:28:01 +02:00
• fdffe8dc1e compatible with qwt 6.1 wang_x1 2016-09-02 16:22:34 +02:00
• 4a7d7ec9e1 Merge branch 'developer' into cmake Dhanya Maliakal 2016-09-02 16:00:04 +02:00
• 4eceb3b5f7 kinda Dhanya Maliakal 2016-09-02 15:47:28 +02:00
• c940607088 Merge branch '2.1-rc' into developer Gemma Tinti 2016-09-01 18:12:59 +02:00
• d2240884b4 settings dir for eiger Gemma Tinti 2016-09-01 18:10:49 +02:00
• 90d2e6b82a eiger manual Gemma Tinti 2016-09-01 15:50:36 +02:00
• 61d347b45d FindQwt returns qwt verison wang_x1 2016-09-01 14:42:47 +02:00
• 5b3ab9a2b4 soewhere Dhanya Maliakal 2016-09-01 13:34:02 +02:00