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

• 4ecbfada5b Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 Dhanya Maliakal 2017-11-22 17:43:12 +01:00
• d47abb140f removed detreceivernocall Dhanya Maliakal 2017-11-22 17:43:00 +01:00
• fb3c903c04 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-22 17:06:51 +01:00
• 6753f8ba6c network parameter should return with extra plus at the end like hostname Dhanya Maliakal 2017-11-22 17:06:43 +01:00
• db6947cc9c Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Dhanya Maliakal 2017-11-22 15:08:33 +01:00
• 590fac9e07 making nx and ny available for jctb in call back Dhanya Maliakal 2017-11-22 15:08:09 +01:00
• 400585be6a Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Anna Bergamaschi 2017-11-22 12:34:28 +01:00
• dcfa6fb100 Fixed filename problem with CPU readout and trimval command for mythen Anna Bergamaschi 2017-11-22 12:34:14 +01:00
• 39a20e1616 comment Dhanya Maliakal 2017-11-22 11:34:55 +01:00
• 114c45c04a making gui work temporarily for jctb Dhanya Maliakal 2017-11-22 09:27:42 +01:00
• 4159e83fd6 making gui work temporarily for jctb Dhanya Maliakal 2017-11-22 09:27:01 +01:00
• 3a26c95c0d Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-21 15:46:21 +01:00
• 8c45f94496 updated npixelsy for jungfrau effecting hdf5 mapping Dhanya Maliakal 2017-11-21 15:46:10 +01:00
• f2f00fec06 Merge branch '3.0.1' into developer Gemma Tinti 2017-11-21 15:35:19 +01:00
• e023cb186f manual Gemma Tinti 2017-11-21 15:34:56 +01:00
• 7f58b77dfb Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-21 15:12:32 +01:00
• fd4dd5b1e9 removed printout Dhanya Maliakal 2017-11-21 15:12:05 +01:00
• 5d34358f44 changin zmqip in rxr should also restart streaming Dhanya Maliakal 2017-11-21 15:11:29 +01:00
• 8328b30cbd removed merge conflicts from bug fix of zmq buffering while acquire from command line Dhanya Maliakal 2017-11-21 14:58:07 +01:00
• 9c55cb4974 removed merge conflicts from bug fix of zmq buffering while acquire from command line Dhanya Maliakal 2017-11-21 14:57:52 +01:00
• a0ad1fb3a3 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-21 14:15:59 +01:00
• 2067f47f34 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-21 14:15:59 +01:00
• 167a6cff3e restart streaming if port changed in multi level, sls detector level:need to take care of it on your own Dhanya Maliakal 2017-11-21 13:42:11 +01:00
• d00df32e49 changing zmq rxr port should restart data streaming Dhanya Maliakal 2017-11-21 13:39:49 +01:00
• 2cc11f1ff0 bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix:zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same Dhanya Maliakal 2017-11-21 13:39:12 +01:00
• 49ba893d7e zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same Dhanya Maliakal 2017-11-21 13:38:31 +01:00
• 46aeee00f1 somewhere Dhanya Maliakal 2017-11-21 12:30:58 +01:00
• 5f0575236e Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Anna Bergamaschi 2017-11-21 12:10:33 +01:00
• 45e0cf71eb put trimval should work also for MYTHEN Anna Bergamaschi 2017-11-21 12:09:52 +01:00
• bd228fac27 bug fix in cleanup code, indexing Dhanya Maliakal 2017-11-20 17:19:03 +01:00
• b7ca7f5319 just cleanuped code Dhanya Maliakal 2017-11-20 17:15:13 +01:00
• 11c9ab16f9 Merge branch '3.0.1' into developer Gemma Tinti 2017-11-20 16:44:21 +01:00
• d1d530f0e7 manual Gemma Tinti 2017-11-20 16:43:39 +01:00
• e6d22a97e2 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-20 15:14:13 +01:00
• a0c014eb7d changed rate correction back to what it was before in users class, enabling sets defaults Dhanya Maliakal 2017-11-20 15:14:01 +01:00
• 99037449f4 in between moench stuff Dhanya Maliakal 2017-11-20 14:23:32 +01:00
• 97260510f2 gap pixels should be allowed to set to 0 for other detectors Dhanya Maliakal 2017-11-20 09:43:41 +01:00
• 662f502d4c zmq always needs an ip in header Dhanya Maliakal 2017-11-17 17:40:57 +01:00
• c5c23e73d5 works zmq separated for client and rx, ports and ip included in expert advanced mode Dhanya Maliakal 2017-11-17 17:39:04 +01:00
• 70e4c6e2a2 zmq separated for client and rx, ports and ip included in expert advanced mode Dhanya Maliakal 2017-11-17 17:37:00 +01:00
• 23b415d837 streaming port set return same as get simple change Dhanya Maliakal 2017-11-17 14:04:03 +01:00
• 428855d801 in between Dhanya Maliakal 2017-11-17 14:02:00 +01:00
• 2e234f1bbd Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-17 11:36:02 +01:00
• a79864a5ae bugfix enabledata streaming send int for update Dhanya Maliakal 2017-11-17 11:35:54 +01:00
• 1dee950870 merge conflict from 3.0.1 Dhanya Maliakal 2017-11-17 11:35:15 +01:00
• 51499fa503 merge conflict from 3.0.1 Dhanya Maliakal 2017-11-17 11:35:02 +01:00
• dcf4d98a75 show warnings, update binaries conflict from merge Dhanya Maliakal 2017-11-17 11:33:52 +01:00
• 28e2ebf75a merge conflict resolved from 3.0.1 Dhanya Maliakal 2017-11-17 09:40:42 +01:00
• 823d537825 fixed warnings Dhanya Maliakal 2017-11-17 09:26:20 +01:00
• d7137e0c75 fixed segmentation fault issue of xputsn the right way, fixed warnings Dhanya Maliakal 2017-11-17 09:26:05 +01:00
• 2569ffbf10 fixed warnings, back to int warning in debugstream due to 64 bit Dhanya Maliakal 2017-11-17 08:53:05 +01:00
• b020270734 edited cmake to show warnings Dhanya Maliakal 2017-11-17 08:46:59 +01:00
• f647bdaa48 updated users class to reflect zmq changes (separation), fixed warnings Dhanya Maliakal 2017-11-17 08:46:43 +01:00
• c1e735c1b4 fixed a few warnings Dhanya Maliakal 2017-11-17 08:46:04 +01:00
• 4097c37b31 in between Dhanya Maliakal 2017-11-16 16:01:31 +01:00
• a89265faf8 Merge branch '3.0.1' into zmqseparate Dhanya Maliakal 2017-11-16 15:09:14 +01:00
• 8e0414d1b9 separating zmqport, enabling in client and receiver works Dhanya Maliakal 2017-11-16 15:01:22 +01:00
• bbcf75bc09 separating zmqport, enabling in client and receiver works Dhanya Maliakal 2017-11-16 15:00:59 +01:00
• 065b4a8e0f including zmq port change in gui Dhanya Maliakal 2017-11-16 13:50:30 +01:00
• 2fca426ec0 Merge branch '3.0' into zmqseparate Dhanya Maliakal 2017-11-16 13:49:11 +01:00
• bf89dd44f3 updated binaries Dhanya Maliakal 2017-11-16 12:34:12 +01:00
• d9fcac0236 updated merge from 3.0 hotfix setdac Dhanya Maliakal 2017-11-16 12:32:38 +01:00
• 875ca44c0b updated server hotfix binary Dhanya Maliakal 2017-11-16 12:30:41 +01:00
• 4c9cc1b477 Merge branch '3.0' into 3.0.1 Dhanya Maliakal 2017-11-16 12:29:34 +01:00
• f340eef4bc updated server hotfix binary Dhanya Maliakal 2017-11-16 12:29:09 +01:00
• f192164e32 fixed setdac bug that comes rarely, moved serialize spi to 32bit Dhanya Maliakal 2017-11-16 12:27:58 +01:00
• c69ae52e76 somewhere Dhanya Maliakal 2017-11-16 09:12:57 +01:00
• 7dee07b9c5 somewhere Dhanya Maliakal 2017-11-16 09:12:54 +01:00
• 0e8d2de253 somewhere Dhanya Maliakal 2017-11-16 09:12:49 +01:00
• fd34bab34b in between separating datastreaming in client and receiver Dhanya Maliakal 2017-11-15 17:19:07 +01:00
• 2b0d07387a in between separating datastreaming in client and receiver Dhanya Maliakal 2017-11-15 17:16:47 +01:00
• eb4ab306c7 in between separating datastreaming in client and receiver Dhanya Maliakal 2017-11-15 17:16:37 +01:00
• 32d32dbcdc in between separating datastreaming in client and receiver Dhanya Maliakal 2017-11-15 16:16:59 +01:00
• 7f256c868b fixed bug for 1D detector in slsDetectorData Anna Bergamaschi 2017-11-15 14:39:35 +01:00
• 06b9efd229 modifications for on the fly analysis working at cSAXS Anna Bergamaschi 2017-11-15 12:23:21 +01:00
• 9ad0fd0bc9 modifications for on the fly analysis working at cSAXS Anna Bergamaschi 2017-11-15 12:21:58 +01:00
• 7c9958db04 updated binary merge from 3.0 regarding settings Dhanya Maliakal 2017-11-15 10:36:55 +01:00
• 956625bb50 Merge branch '3.0' into developer Dhanya Maliakal 2017-11-15 10:35:20 +01:00
• 6d6133be59 Merge branch '3.0' into zmqseparate Dhanya Maliakal 2017-11-15 10:34:30 +01:00
• bee751cebb updated binaries Dhanya Maliakal 2017-11-15 09:31:49 +01:00
• fee95d228e Merge branch '3.0' into 3.0.1 Dhanya Maliakal 2017-11-15 09:29:05 +01:00
• ea0c436fc8 updated binaries Dhanya Maliakal 2017-11-15 08:07:59 +01:00
• 90fb8258ca updated binaries Dhanya Maliakal 2017-11-14 17:52:51 +01:00
• dd1cf42a73 proper fix for settings, including dacs Dhanya Maliakal 2017-11-14 17:51:13 +01:00
• dda86cfe9b somewhere in separating zmq rxr and client Dhanya Maliakal 2017-11-14 16:26:17 +01:00
• 4f74f6d08f Merge branch '3.0.1' into developer Gemma Tinti 2017-11-14 15:19:14 +01:00
• a3a30d9b50 manual Gemma Tinti 2017-11-14 15:18:39 +01:00
• 2d962dfead Merge branch '3.0.1' into developer Gemma Tinti 2017-11-14 12:43:19 +01:00
• b814515d0a manual Gemma Tinti 2017-11-14 12:42:30 +01:00
• db2fef5d69 conflict resolved in merge from 3.0.1 to include file index in zmq streaming Dhanya Maliakal 2017-11-14 12:14:26 +01:00
• 0ae706d9a5 file index sent along with zmq stream Dhanya Maliakal 2017-11-14 12:13:06 +01:00
• 6693d08331 fixed help of acquire doing an actual acquisition Dhanya Maliakal 2017-11-14 11:53:37 +01:00
• cf4498cf78 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-14 10:59:01 +01:00
• 4903164f95 added high voltage to users class Dhanya Maliakal 2017-11-14 10:58:54 +01:00
• c127eebeaa Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-14 09:13:39 +01:00
• ef257d12e7 prev bug fix of ratecorr for eiger from users, made simpler Dhanya Maliakal 2017-11-14 09:13:32 +01:00
• 363aa9124e Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-14 09:08:16 +01:00
• 7e0af1cc7c bugfix: users rate correction able to set for eiger Dhanya Maliakal 2017-11-14 09:08:08 +01:00
• 8872f86e31 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-11-13 15:32:47 +01:00
• 52a9303a5e removed compression from gui in expert mode Dhanya Maliakal 2017-11-13 15:32:24 +01:00