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

• 409519a3db fixed the double plot due to unzooming in gui Dhanya Maliakal 2017-11-13 15:25:49 +01:00
• 4c4a26c0e3 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-13 13:39:39 +01:00
• 70848c9891 bugfix ratecorr always gave back -100 Dhanya Maliakal 2017-11-13 13:39:28 +01:00
• e33ba2cd76 merge from 3.0.1 compiling with rpath and updating detector binaries Dhanya Maliakal 2017-11-13 12:32:08 +01:00
• dedc00f1bd compiling with rflag Dhanya Maliakal 2017-11-13 12:28:27 +01:00
• 1af065fdb1 infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix Dhanya Maliakal 2017-11-13 11:13:26 +01:00
• 678ef89e17 conflict resolved from merge developer to gappixels insignificant Dhanya Maliakal 2017-11-10 16:54:18 +01:00
• dc70c45ef2 Merge branch 'developer' into gappixels Dhanya Maliakal 2017-11-10 16:53:14 +01:00
• c0ec315b04 Merge branch 'developer' into gappixels Dhanya Maliakal 2017-11-10 16:53:14 +01:00
• 6fa4e4cef8 Merge branch '3.0.1' into gappixels Dhanya Maliakal 2017-11-10 16:37:28 +01:00
• 3886a0c9ad merge fix from 3.0.1 regarding gethostbyname thread safety Dhanya Maliakal 2017-11-10 16:37:20 +01:00
• 5b65d44303 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-10 16:34:43 +01:00
• 23ddb3d4b5 merge fix from 3.0.1 regarding gethostbyname thread safety Dhanya Maliakal 2017-11-10 16:34:31 +01:00
• e1c7176c00 Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_receiver_software into 3.0.1 Dhanya Maliakal 2017-11-10 16:31:01 +01:00
• 53caebe0f3 replaced gethostbyname with getaddrinfo as it is not thread safe Dhanya Maliakal 2017-11-10 16:30:48 +01:00
• 739187943d replaced gethostbyname with getaddrinfo as it is not thread safe Dhanya Maliakal 2017-11-10 16:30:38 +01:00
• a2210c0118 Merge branch '3.0.1' into gappixels Dhanya Maliakal 2017-11-09 14:08:04 +01:00
• 6d0f751104 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-09 14:07:48 +01:00
• fb0afc282d gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit Dhanya Maliakal 2017-11-09 14:01:26 +01:00
• d24ab31d87 gotthard fix Dhanya Maliakal 2017-11-09 13:44:38 +01:00
• 9255cdde8a bug fixx for the 9m gethostbyname being not thread safe Dhanya Maliakal 2017-11-09 13:42:57 +01:00
• 7c344d4a39 recompile with -fPIC flag Xiaoqiang Wang 2017-11-08 15:14:34 +01:00
• 3c6d572369 including dynamic range in gui call back Dhanya Maliakal 2017-11-02 11:02:40 +01:00
• 7ba90f98fc including dynamic range in gui call back Dhanya Maliakal 2017-11-02 11:02:22 +01:00
• 589a5c7852 Merge branch '3.0.1' into gappixels Dhanya Maliakal 2017-11-02 10:55:05 +01:00
• 0df4576874 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-02 10:54:40 +01:00
• 7157b2817d update to zmq 4.0.8 Xiaoqiang Wang 2017-11-02 10:49:24 +01:00
• 82f503aa09 dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui Dhanya Maliakal 2017-10-31 12:50:31 +01:00
• 3da8bca462 allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful Dhanya Maliakal 2017-10-31 12:39:36 +01:00
• 9d4c14b724 gap pixels should now work for 4 bit mode and a bug fix in decoding for 4 bit mode Dhanya Maliakal 2017-10-31 12:38:42 +01:00
• 6ff249c3f2 Merge branch 'developer' into gappixels Dhanya Maliakal 2017-10-27 16:18:52 +02:00
• e12229633c update binaries Dhanya Maliakal 2017-10-27 16:18:21 +02:00
• b75dde4613 merge bug fix of set module Dhanya Maliakal 2017-10-27 16:17:12 +02:00
• f6989d5539 merge bug fix of set module Dhanya Maliakal 2017-10-27 16:16:38 +02:00
• 7ff23b25b3 merge bug fix of set module Dhanya Maliakal 2017-10-27 16:16:29 +02:00
• acfd9acc6c update binaries Dhanya Maliakal 2017-10-27 16:09:46 +02:00
• 18d5fd5a35 update binaries Dhanya Maliakal 2017-10-27 16:08:52 +02:00
• 1881cb0010 updated binaries Dhanya Maliakal 2017-10-27 16:07:42 +02:00
• 1420921291 Merge branch '3.0' into 3.0.1 Dhanya Maliakal 2017-10-27 15:47:15 +02:00
• aab56ea943 updated jungfrau server binary Dhanya Maliakal 2017-10-27 15:39:55 +02:00
• 045a7cfcb1 removed settings bug, highvoltage returning 60 when switched off Dhanya Maliakal 2017-10-27 15:38:07 +02:00
• 92f988ddc1 somewhere Dhanya Maliakal 2017-10-27 14:00:57 +02:00
• 79bce5e006 4 bit mode works without gappixels Dhanya Maliakal 2017-10-26 16:01:18 +02:00
• 9c82a8f726 temp in between, trying to get 4 bitmode to work without gap pixels Dhanya Maliakal 2017-10-26 11:19:58 +02:00
• 6812961836 temp in between, trying to get 4 bitmode to work without gap pixels Dhanya Maliakal 2017-10-26 11:09:55 +02:00
• 003239cddd gap pixels for 4 bit mode restrictions, not completed Dhanya Maliakal 2017-10-24 14:16:08 +02:00
• ce7386e230 merge solved from developer, xcoord from detector if given Dhanya Maliakal 2017-10-23 17:21:45 +02:00
• fde4194f9b merged with developer, receiver call back merged with no call back Dhanya Maliakal 2017-10-23 17:12:00 +02:00
• 7f9ac86862 Merge branch 'developer' into gappixels Dhanya Maliakal 2017-10-23 17:09:13 +02:00
• 16a939c0c0 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-10-23 17:08:12 +02:00
• f4f03f659a color code in user example depending on modID, instead of xcoord Dhanya Maliakal 2017-10-23 17:07:45 +02:00
• 4084e2c31e updated release doc Dhanya Maliakal 2017-10-23 17:06:12 +02:00
• e417885459 merge conflict in release, merged incorporating no call back and call back into one user example Dhanya Maliakal 2017-10-23 15:30:00 +02:00
• 65fd5a3057 merged without call back and call back into one user example Dhanya Maliakal 2017-10-23 15:26:04 +02:00
• 1f138abac1 fix in receiver as x, y and z are properly integrated with detector server for eiger and jungfrau, and handling previous versions of detector where x y and z were all 0 (hardcoding them in 1 d) Dhanya Maliakal 2017-10-23 12:21:41 +02:00
• d2fd0cbee9 x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well Dhanya Maliakal 2017-10-23 12:20:18 +02:00
• 210bcb081d xcoord should not be hardcoded for this version for eiger and jungfrau Dhanya Maliakal 2017-10-20 10:49:02 +02:00
• 387b4ef457 updated release with patches notes Dhanya Maliakal 2017-10-19 17:09:50 +02:00
• 673b7f1652 merge conflict fixed with developer Dhanya Maliakal 2017-10-19 15:36:28 +02:00
• b6ae3300a9 merge conflict fixed with developer(patches for file write disable, xcoord) Dhanya Maliakal 2017-10-19 15:35:34 +02:00
• c755a5b602 bug fix to release.txt from the merge Dhanya Maliakal 2017-10-19 14:41:46 +02:00
• 801817b749 bug fix to the merge Dhanya Maliakal 2017-10-19 14:41:12 +02:00
• 1cddb9a542 merge from 3.0.1 with patches for file write disable Dhanya Maliakal 2017-10-18 17:53:55 +02:00
• 72b71cd680 merge from 3.0 hotfixes done Dhanya Maliakal 2017-10-18 17:39:19 +02:00
• 5388b54eff updaterev Dhanya Maliakal 2017-10-18 15:52:08 +02:00
• 75b94e6614 fixed file write enable bug from the last patch Dhanya Maliakal 2017-10-18 12:29:46 +02:00
• 4aa0c8e24e Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 Dhanya Maliakal 2017-10-17 12:14:40 +02:00
• 927e776353 Merge branch 'developer' into gappixels Dhanya Thattil 2017-10-12 15:09:35 +02:00
• 36a200ceba Merge branch 'developer' into gappixels Dhanya Thattil 2017-10-12 15:09:30 +02:00
• 0fe43c75f2 merge branch developer into gappixels, added .project into gitignore Dhanya Thattil 2017-10-12 15:08:32 +02:00
• 4d92744dea .project added to gitignore Dhanya Thattil 2017-10-12 15:08:12 +02:00
• ae72df7b14 .project added to gitignore Dhanya Thattil 2017-10-12 15:07:54 +02:00
• e814aee300 .project added to gitignore Dhanya Thattil 2017-10-12 15:07:33 +02:00
• 4f2af046d3 Merge branch 'developer' into gappixels Dhanya Thattil 2017-10-12 14:58:41 +02:00
• 91588ecc21 Merge branch 'developer' into gappixels Dhanya Thattil 2017-10-12 14:58:25 +02:00
• d2767afa7c added the eiger server binary with merges from 3.0.1 Dhanya Maliakal 2017-10-12 14:57:12 +02:00
• 311059d748 merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch Dhanya Thattil 2017-10-12 14:42:57 +02:00
• 40cb2993fb eiger manual Gemma Tinti 2017-10-12 12:15:43 +02:00
• fe6e1c8868 new eiger server binary with status fixed Dhanya Maliakal 2017-10-12 11:48:43 +02:00
• eb78ae0fe1 new eiger server binary with status fixed Dhanya Maliakal 2017-10-12 11:44:46 +02:00
• 8585a536ec fixed eiger server status problem, updating binary in next commit Dhanya Thattil 2017-10-12 11:42:37 +02:00
• 338fb2af35 in betwee, fixed eiger server error Dhanya Thattil 2017-10-12 11:38:26 +02:00
• a6e520d969 in between stage: error in compiling eiger server with error status: include file Dhanya Thattil 2017-10-12 11:35:31 +02:00
• eb32335194 trying changes to server for error Dhanya Thattil 2017-10-12 10:51:47 +02:00
• 10e57319bf moench03OnTheFlyAnalysis multipthreaded with interpolation works Anna Bergamaschi 2017-10-12 10:31:11 +02:00
• a59309b13f minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition Dhanya Thattil 2017-10-12 10:18:15 +02:00
• f2f061ae18 bug fix: using int instead of int64_t , eg exptime is -1 on return Dhanya Thattil 2017-10-12 09:47:13 +02:00
• d30a839eff file writer class should be created only if file write enabled, x coord fixed to reflect hardcoded values as detector does not send this value yet Dhanya Thattil 2017-10-10 16:54:50 +02:00
• 948eb455e2 editing release text, in between, need to still fix eiger server with new eror status functionality Dhanya Maliakal 2017-10-10 12:15:04 +02:00
• 44bf4c52ed changes for eiger server to return error if error Dhanya Maliakal 2017-10-06 13:48:06 +02:00
• 2e5f64d9bc gap pixels for 8, 16, 32 in receiver at udp level Dhanya Maliakal 2017-10-05 15:59:07 +02:00
• 0d92b11055 print out comment, not print if mythen else access to null Dhanya Maliakal 2017-10-05 15:58:37 +02:00
• 4260dc0baf conflict resolution Dhanya Maliakal 2017-10-03 15:18:56 +02:00
• 0f302e3446 conflict resolution Dhanya Maliakal 2017-10-03 15:17:15 +02:00
• e54767b69d conflict resolution with developer Dhanya Maliakal 2017-10-03 15:12:56 +02:00
• 812606a7b4 conflict resolution with developer Dhanya Maliakal 2017-10-03 15:12:49 +02:00
• fc025bd28b conflict resolution with developer Dhanya Maliakal 2017-10-03 15:12:35 +02:00
• 34f10b382e one more conflict resolved from mergin with 3.0.1 (silent mode, this had changes for zmq source ip) Dhanya Maliakal 2017-10-03 15:01:30 +02:00
• 0b82aabd2b merge with 3.0.1 conflicts resolved Dhanya Maliakal 2017-10-03 14:52:53 +02:00
• 03a2f979a9 fixing merge conflict in error_Defs Dhanya Maliakal 2017-10-03 14:32:30 +02:00