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

• 58e90a85be Merge remote branch 'slsDetectorSoftware/2.3' into 2.3 Dhanya Maliakal 2017-12-04 16:47:33 +01:00
• 025c836e25 Merge remote branch 'slsDetectorGui/2.2' into 2.2 origin/2.2 Dhanya Maliakal 2017-12-04 16:47:28 +01:00
• 5d5abae3f4 Merge remote branch 'slsReceiverSoftware/2.2' into 2.2 Dhanya Maliakal 2017-12-04 16:47:28 +01:00
• e2ad46386e Merge remote branch 'slsDetectorSoftware/2.2' into 2.2 Dhanya Maliakal 2017-12-04 16:47:26 +01:00
• 308d44e452 Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1 origin/2.1.1 Dhanya Maliakal 2017-12-04 16:47:22 +01:00
• 69da61b1fb Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1 Dhanya Maliakal 2017-12-04 16:47:22 +01:00
• 460168ce04 Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1 Dhanya Maliakal 2017-12-04 16:47:21 +01:00
• 4e429c0d77 Merge remote branch 'slsDetectorGui/2.1' into 2.1 origin/2.1 Dhanya Maliakal 2017-12-04 16:45:34 +01:00
• bf4fab549d Merge remote branch 'slsReceiverSoftware/2.1' into 2.1 Dhanya Maliakal 2017-12-04 16:45:34 +01:00
• f7705eb1da Merge remote branch 'slsDetectorSoftware/2.1' into 2.1 Dhanya Maliakal 2017-12-04 16:45:32 +01:00
• a2217e2066 Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5 origin/2.0.5 Dhanya Maliakal 2017-12-04 15:33:33 +01:00
• aaa02706fc Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5 Dhanya Maliakal 2017-12-04 15:31:52 +01:00
• 9f152ce1f3 merge conflict resolved Dhanya Maliakal 2017-12-01 12:44:34 +01:00
• d1e3d50a87 cosmetic print outs Dhanya Maliakal 2017-12-01 12:43:14 +01:00
• a06f29f473 minor cosmetics Dhanya Maliakal 2017-12-01 11:23:17 +01:00
• 12348ac76c merge conflict fix Dhanya Maliakal 2017-12-01 09:20:44 +01:00
• 18422ce215 setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked Dhanya Maliakal 2017-12-01 09:18:42 +01:00
• 0e26734023 restreaming stop fix Dhanya Maliakal 2017-11-30 19:13:55 +01:00
• fd64ba289e Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-30 19:07:21 +01:00
• e9343a5bd0 remove warning Dhanya Maliakal 2017-11-30 19:07:05 +01:00
• 6f3898441e merge conflict from 3.0.1 to restream stop from recieveR Dhanya Maliakal 2017-11-30 19:05:47 +01:00
• 5b88203bd9 merge conflict from 3.0.1 to restream stop from recieveR Dhanya Maliakal 2017-11-30 19:05:35 +01:00
• 385e6714cc merge conflict from 3.0.1 to restream stop from recieveR Dhanya Maliakal 2017-11-30 19:05:19 +01:00
• 70bf6eb4cb restream stop from receiver Dhanya Maliakal 2017-11-30 18:39:08 +01:00
• ca855e6d39 restream stop from receiver Dhanya Maliakal 2017-11-30 18:37:11 +01:00
• 2227265357 removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire Dhanya Maliakal 2017-11-30 16:25:23 +01:00
• baee38802b wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it Dhanya Maliakal 2017-11-30 16:20:26 +01:00
• 1edb41242c ensure gui gets measurement finished after dummy packet received from receiver/ext process Dhanya Maliakal 2017-11-29 15:22:10 +01:00
• 397344a264 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-29 12:13:09 +01:00
• 712c9a4524 zmq connect earlier in gui to prevent losing first messages Dhanya Maliakal 2017-11-29 12:13:02 +01:00
• e17e4c3171 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 18:50:27 +01:00
• b75985088d twice connect bug fix in zmq Dhanya Maliakal 2017-11-28 18:50:18 +01:00
• 8bba57e77d fix to not have sls_receiver_defs in zmqSocket.h incldue Dhanya Maliakal 2017-11-28 16:32:15 +01:00
• 7c1423d654 zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue Dhanya Maliakal 2017-11-28 16:31:43 +01:00
• 8388d1f503 using file index from zmq Dhanya Maliakal 2017-11-28 14:45:48 +01:00
• 6a41b5ce3a using file index from zmq Dhanya Maliakal 2017-11-28 14:45:29 +01:00
• 1c606df752 using file index from zmq Dhanya Maliakal 2017-11-28 14:45:01 +01:00
• 1e85482d09 make updated Dhanya Maliakal 2017-11-28 11:30:23 +01:00
• a89847538d merge ocnflict for white background Dhanya Maliakal 2017-11-28 11:29:15 +01:00
• 130f3d2e6f Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 11:18:43 +01:00
• a351fa8f28 switching from black to white background for receiver Dhanya Maliakal 2017-11-28 11:18:30 +01:00
• 4825ace129 switching from black to white background for receiver Dhanya Maliakal 2017-11-28 11:18:22 +01:00
• 57fc89a6bb comment users Dhanya Maliakal 2017-11-28 10:51:05 +01:00
• ba71529ff2 comment in users Dhanya Maliakal 2017-11-28 10:50:35 +01:00
• f49998ccd9 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 10:35:24 +01:00
• 1fce54ec4b zmqport in users fixed Dhanya Maliakal 2017-11-28 10:35:06 +01:00
• 41f24489bc zmqip in users fixed Dhanya Maliakal 2017-11-28 10:33:40 +01:00
• addf964901 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 09:37:09 +01:00
• bca7c649d7 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 09:37:09 +01:00
• 1dd300f713 only call register call back which already enables streaming in client and receiver, added to postprocessing Dhanya Maliakal 2017-11-28 09:36:54 +01:00
• d5c310a2db only call register call back which already enables streaming in client and receiveR Dhanya Maliakal 2017-11-28 09:36:14 +01:00
• 747e9af431 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 09:26:55 +01:00
• 9f91b78696 update comments Dhanya Maliakal 2017-11-28 09:26:12 +01:00
• 620f7651a0 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-28 09:24:57 +01:00
• d1eab6f750 updated slsdetector users for zmqport set up Dhanya Maliakal 2017-11-28 09:24:40 +01:00
• 4466213882 makng the zmq work without external flag Dhanya Maliakal 2017-11-27 17:06:27 +01:00
• ca19993149 makng the zmq work without external flag Dhanya Maliakal 2017-11-27 17:06:18 +01:00
• e29371ca8d makng the zmq work without external flag Dhanya Maliakal 2017-11-27 17:06:11 +01:00
• c0a114345b bug fix set error mask when setting wrong settings Dhanya Maliakal 2017-11-27 16:11:33 +01:00
• 386ef7766c zmq streaming should work with external gui now Dhanya Maliakal 2017-11-27 16:01:12 +01:00
• 375b1c9485 not required to restart client datastreaming due to connect everytime for acquire Dhanya Maliakal 2017-11-27 15:40:36 +01:00
• 3439ccbec9 updates for merge for r_readfreq without reciever Dhanya Maliakal 2017-11-23 18:30:48 +01:00
• a0c9018455 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 18:24:34 +01:00
• f0431bd873 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 18:24:33 +01:00
• 65d7922286 merge solved Dhanya Maliakal 2017-11-23 18:24:24 +01:00
• eb89e9bf96 Merge branch '3.0.1' into zmqchange Dhanya Maliakal 2017-11-23 18:22:27 +01:00
• 9f733c1dfb Merge branch '3.0.1' into zmqchange Dhanya Maliakal 2017-11-23 18:22:26 +01:00
• 59b5fe9424 receiver read freq should save value in shm even if no receiver present Dhanya Maliakal 2017-11-23 18:22:03 +01:00
• 16e4fbf8dd receiver read freq should save value in shm even if no receiver present Dhanya Maliakal 2017-11-23 18:21:54 +01:00
• d40a2e0efa receiver read freq should save value in shm even if no receiver present Dhanya Maliakal 2017-11-23 18:21:29 +01:00
• ab5229bcbf bugfix zmq ip was being overwritten Dhanya Maliakal 2017-11-23 17:48:30 +01:00
• 5eb8402742 bugfix zmq streaming both on Dhanya Maliakal 2017-11-23 17:28:35 +01:00
• 585661412c Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 17:20:13 +01:00
• dc5384f0f9 copy zmq port even if receiver not online, else it is lost Dhanya Maliakal 2017-11-23 17:20:07 +01:00
• 935fecefde copy zmq ip even if receiver not online, else it is lost Dhanya Maliakal 2017-11-23 17:18:40 +01:00
• 20dc338c90 when changing network parameter, switch off data streaming only if on Dhanya Maliakal 2017-11-23 17:00:12 +01:00
• 2c276db579 solved merge conflict in changes to use ZmqSocket.h externally Dhanya Maliakal 2017-11-23 16:35:31 +01:00
• b14ea217ee Merge branch '3.0.1' into zmqchange Dhanya Maliakal 2017-11-23 16:34:14 +01:00
• da3ca9f306 changes to use ZmqSocket.h externally without further changes Dhanya Maliakal 2017-11-23 16:28:02 +01:00
• a57e8edd88 jctb setting dr correctly Dhanya Maliakal 2017-11-23 16:15:38 +01:00
• ad64df01c7 somewhere Dhanya Maliakal 2017-11-23 14:53:40 +01:00
• 8538604c0f somewhere Dhanya Maliakal 2017-11-23 14:53:37 +01:00
• d23c9d52ed somewhere Dhanya Maliakal 2017-11-23 14:53:33 +01:00
• 2ac170db98 removed data streaming shutdown from command line to allow external gui Dhanya Maliakal 2017-11-23 11:52:46 +01:00
• ab93835ce2 merge conflict to include datastreaming in client comment Dhanya Maliakal 2017-11-23 10:29:08 +01:00
• 3b292bdeb6 need to enable data streaming for client Dhanya Maliakal 2017-11-23 10:27:59 +01:00
• 43140811bd one measurement in users class Dhanya Maliakal 2017-11-23 10:25:35 +01:00
• 34908edd6a Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 10:22:03 +01:00
• 856ad76247 included setreceiver online in users class, so that one can start using users without config file Dhanya Maliakal 2017-11-23 10:21:54 +01:00
• 29f3387d73 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 09:34:22 +01:00
• 4749e8c4e4 modified users client to work without config and better print out Dhanya Maliakal 2017-11-23 09:34:12 +01:00
• a1d325a115 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-23 09:20:22 +01:00
• 3034cf87d0 changes that might be reverted in detser Dhanya Maliakal 2017-11-23 09:20:20 +01:00
• 447451231c modified users client to work without config and better print out Dhanya Maliakal 2017-11-22 18:09:16 +01:00
• 0b45d73e0c Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-22 18:02:45 +01:00
• 7860637b46 switching off data streaming from command line only in receiver start and not in receiver as a whoel put command Dhanya Maliakal 2017-11-22 18:02:36 +01:00
• c0bfe46aa1 enabling client in developer user api Dhanya Maliakal 2017-11-22 18:00:41 +01:00
• 26829585dc Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-22 17:47:28 +01:00
• ea3c722552 made a bin in manual api to be able to compile here Dhanya Maliakal 2017-11-22 17:47:16 +01:00
• c0a1f83691 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-22 17:43:49 +01:00