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

• 83f3ab145e resolved conflict in merging with release Dhanya Maliakal 2016-02-25 14:17:32 +01:00
• d4b388f434 unresolved conflict Dhanya Maliakal 2016-02-25 14:13:42 +01:00
• bda8b69e05 Merge branch 'master' into release Dhanya Maliakal 2016-02-25 14:01:22 +01:00
• 683ea31963 removed comment entering missing zone Dhanya Maliakal 2016-02-25 13:56:23 +01:00
• 1ef91414d6 Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_receiver_software into release Dhanya Maliakal 2016-02-25 13:51:34 +01:00
• 0fa33dc74c added gotthard server version executable Dhanya Maliakal 2016-02-25 12:12:39 +01:00
• e508050be8 bug fix: converts any receiver other than eiger into a jungfrau receiver Dhanya Maliakal 2016-02-25 12:11:05 +01:00
• ebdb21ccfe added iodelay with setttings Dhanya Maliakal 2016-02-24 18:10:59 +01:00
• 7eda239e45 Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release Dhanya Maliakal 2016-02-24 18:09:28 +01:00
• 59262c28c2 added iodelay with setttings Dhanya Maliakal 2016-02-24 18:09:16 +01:00
• 98ef40b1b6 Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release Dhanya Maliakal 2016-02-24 18:05:39 +01:00
• 5af05c24c1 added iodelay with setttings Dhanya Maliakal 2016-02-24 18:05:17 +01:00
• d8007477b5 High Voltage index changed for jungfrau Anna Bergamaschi 2016-02-22 15:11:30 +01:00
• f113b1afbb Added status stopped Anna Bergamaschi 2016-02-22 15:07:05 +01:00
• e7a7dd8c6b Merging with anna's jungfrau detector server version Anna Bergamaschi 2016-02-22 15:02:42 +01:00
• 66eddb1afe Added stopped status Anna Bergamaschi 2016-02-22 14:00:22 +01:00
• 13db6a7df5 New interface for PLL reconfig of Junfraus server; moved some_fifo_full_bit and added stopped status Anna Bergamaschi 2016-02-22 13:59:53 +01:00
• 1633cc3f01 incorporated rate correction of eiger into gui Dhanya Maliakal 2016-02-17 18:04:24 +01:00
• 0b1710c267 updated server bianry Dhanya Maliakal 2016-02-17 18:03:32 +01:00
• 4eba07ca90 added error message tau/subexptime to error list Dhanya Maliakal 2016-02-17 18:01:58 +01:00
• cb1a30c450 added the script to change and add server with the version numbering Dhanya Maliakal 2016-02-17 15:18:39 +01:00
• 8d2f54838a fixed corrections for rate correction, needed to reset daq completely Dhanya Maliakal 2016-02-17 15:17:40 +01:00
• 764078d465 something Dhanya Maliakal 2016-02-16 11:07:12 +01:00
• db2e75460e fixed bug of wrong number of frames in receiver when server starts Dhanya Maliakal 2016-02-12 17:26:14 +01:00
• a0c6aad7c6 renamed eiger server final to reflect the revision Dhanya Maliakal 2016-02-12 15:26:37 +01:00
• e2133317f5 add missing commands and cleanup Gemma Tinti 2016-02-12 14:32:03 +01:00
• 3225427043 spell check client manual Gemma Tinti 2016-02-12 14:04:54 +01:00
• 75a75f3328 update Anna Bergamaschi 2016-02-12 11:09:47 +01:00
• bd91aea713 Some defs for JCTB receiver Anna Bergamaschi 2016-02-11 17:09:54 +01:00
• a3e2a6c37c removed unnecessary eiger server executables Dhanya Maliakal 2016-02-11 14:24:21 +01:00
• 5d3c427f11 changed setctrbit command to resmat Dhanya Maliakal 2016-02-11 10:48:58 +01:00
• 1e3f9e8ead fixed receiver toalso get frames*cycles as number of frames Dhanya Maliakal 2016-02-10 17:03:10 +01:00
• dbedc9b7df rate correction for eiger implemented Dhanya Maliakal 2016-02-10 11:25:58 +01:00
• 3c4b0c24c8 rate correction for eiger implemented Dhanya Maliakal 2016-02-10 11:24:49 +01:00
• 9067da5e88 rate correction for eiger implemented Dhanya Maliakal 2016-02-10 11:22:59 +01:00
• 5029eb0c86 bug fixed maximum sub exposure time is in 10 ns and not ns Dhanya Maliakal 2016-02-08 15:25:28 +01:00
• f0c4a4a7e4 almost done Dhanya Maliakal 2016-02-08 15:20:19 +01:00
• cf3e736d7e fixed bug that still reads hostname and expects a 0XX format, also prints revision number in decimal and not hex Dhanya Maliakal 2016-02-08 11:25:10 +01:00
• 23058987a4 mid way, had to change to fix bug Dhanya Maliakal 2016-02-08 11:11:36 +01:00
• 07f1bd5c82 mid way, had to change to fix bug Dhanya Maliakal 2016-02-08 10:40:54 +01:00
• 5afb38c1ec changing the print outs Dhanya Maliakal 2016-02-08 10:40:33 +01:00
• fed40b02c4 fixed measurement progress bar bug that kepts getting reset for each measurement Dhanya Maliakal 2016-02-05 11:29:02 +01:00
• 03fc676b7e removed JUNGFRAU_DHANYA completely from Makefile, used N_CHAN instead of NCHAN macro since it isnot constant, and corrected registerdefs Dhanya Maliakal 2016-02-04 17:26:05 +01:00
• 1fae912cb2 jungfrau server making it uniform, left to do: register confirmation and server_defs Dhanya Maliakal 2016-02-04 16:18:01 +01:00
• 35631c0abb some changes with anna. more to come Dhanya Maliakal 2016-02-04 12:57:07 +01:00
• 0c9806e17f jungfrau header changed Dhanya Maliakal 2016-02-04 12:39:05 +01:00
• 41f7743af9 included fifodepth for jungfrau. Needed else its stuck Dhanya Maliakal 2016-02-03 16:27:23 +01:00
• 6cc22a350d Merge branch 'release' into jungfrauv1.0 Dhanya Maliakal 2016-02-03 15:05:50 +01:00
• 615909f178 Merge branch 'release' into jungfrauv1.0 Dhanya Maliakal 2016-02-03 15:00:53 +01:00
• e3d9fd1c02 Merge branch 'release' into jungfrauv1.0 Dhanya Maliakal 2016-02-03 14:59:22 +01:00
• c217cb0978 merging with release Dhanya Maliakal 2016-02-03 14:58:32 +01:00
• ef8fbab1f4 10g bug fixed in previous branch merge Dhanya Maliakal 2016-02-03 11:34:47 +01:00
• fed17eb8eb modified color of printout Dhanya Maliakal 2016-02-03 11:26:18 +01:00
• 72cfd7a1d7 all changes done with bugs solved. need to test with image reconstruction Dhanya Maliakal 2016-02-02 18:57:20 +01:00
• f19031a736 all changes done Dhanya Maliakal 2016-02-02 18:52:24 +01:00
• 3045876a86 solved bug problem Dhanya Maliakal 2016-02-02 17:33:57 +01:00
• 8ca9157882 corrected checkout script Dhanya Maliakal 2016-02-02 11:37:40 +01:00
• 1230b63b29 Merge branch 'release', remote branch 'origin' into release Dhanya Maliakal 2016-02-02 11:21:07 +01:00
• 316ecf1b50 no change check Dhanya Maliakal 2016-02-02 11:10:49 +01:00
• d0a38d203d Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release Dhanya Maliakal 2016-02-02 10:50:25 +01:00
• d489b34824 Test commit, added a space in makefile Martin Brückner 2016-02-02 10:49:40 +01:00
• b27e42f193 Merge branch 'release', remote branch 'origin' into release Dhanya Maliakal 2016-02-02 10:48:15 +01:00
• 0ce03226ee changed the checkout script to point to new remote repo Dhanya Maliakal 2016-02-02 10:42:59 +01:00
• 39c3a712e1 solved a bit, but not the create fiel problem Dhanya Maliakal 2016-02-01 17:57:43 +01:00
• bef8d413d6 jungfrau done but not merged Dhanya Maliakal 2016-01-21 14:43:44 +01:00
• f477b7a5ac not much changes Dhanya Maliakal 2016-01-19 16:25:48 +01:00
• deb72feb91 still not resolved altho some changes Dhanya Maliakal 2016-01-19 14:39:58 +01:00
• 1477f67c4c eiger documentation Gemma Tinti 2016-01-15 14:39:02 +01:00
• a785eb7d5e newline after wrong command Gemma Tinti 2016-01-08 17:18:50 +01:00
• 22cb739c7f start to update manuals for Eiger Gemma Tinti 2016-01-08 17:13:48 +01:00
• 09807aae49 Added slsReceiverScript and xterms Martin Brückner 2015-12-16 16:14:18 +01:00
• 5c239ad45f data call back form receiver includes both x and y dimensions Dhanya Maliakal 2015-12-16 15:01:00 +01:00
• ff7a2d5185 Added slsReceiverScript and xterms Martin Brückner 2015-12-15 16:31:18 +01:00
• 06e810169d Revert "trying to fix for 2D detector(eiger)" Wang Xiaoqiang 2015-12-15 16:29:47 +01:00
• 54c1765f34 Revert "Revert "pulse chip fixed"" Wang Xiaoqiang 2015-12-15 16:29:35 +01:00
• ca6f2b8588 Revert "pulse chip fixed" Wang Xiaoqiang 2015-12-15 16:26:44 +01:00
• 7848b79cf2 2d noop for setdetectorsize Dhanya Maliakal 2015-12-15 16:24:43 +01:00
• cd80160e7d getdetectorsize in users reflects 2d addon Dhanya Maliakal 2015-12-15 15:40:39 +01:00
• 2dd2b577fd getdetectorsize in users reflects 2d Dhanya Maliakal 2015-12-15 15:36:49 +01:00
• d6c4ec184a should show progress for each measurement, not collectively Dhanya Maliakal 2015-12-15 14:25:53 +01:00
• 921154e43a detsizechan or maximum detecto size for users incorrectly implemented for only 1d Dhanya Maliakal 2015-12-15 12:07:28 +01:00
• bb78d1af73 solved recover from root permission error Dhanya Maliakal 2015-12-15 11:59:17 +01:00
• 18eb1274c5 fixed fifodepth to return defualt size, also moved destroying and creating threads to fifostructure, had forgotten to override setnumberofframes calling fifostructure which is important for gotthard Dhanya Maliakal 2015-12-15 11:04:49 +01:00
• 50d76f5537 iodelay set to 650, rxb_lb and rb set to 1100, 10g detectormac set to +1 of 1g Dhanya Maliakal 2015-12-14 15:15:27 +01:00
• 532ac38ad5 dont know Dhanya Maliakal 2015-12-09 16:15:23 +01:00
• 4fc8065ef5 trying to fix for 2D detector(eiger) Wang Xiaoqiang 2015-12-08 13:26:17 +01:00
• 0c28dcec4f added data structure file for m03 T mounting and data structure for m02 l_msdetect 2015-12-03 10:17:26 +01:00
• 0f6fa37ca1 new default files Anna Bergamaschi 2015-12-02 16:50:03 +01:00
• f16db2e6ca 10giga offset corrected Dhanya Maliakal 2015-12-02 09:39:16 +01:00
• 700346fbbe some changes for gui for settings for jungfrau Dhanya Maliakal 2015-12-01 17:15:41 +01:00
• 4dc8213cf6 added jungfrau settings directories Dhanya Maliakal 2015-12-01 16:46:07 +01:00
• b05207221c ansi and test server for jungfrau server Dhanya Maliakal 2015-12-01 16:45:18 +01:00
• 61f0506c2c settings for jungfrau Dhanya Maliakal 2015-12-01 16:43:23 +01:00
• 34508012a8 prevnumber is unsigned before bug Dhanya Maliakal 2015-12-01 16:39:01 +01:00
• 58dbc59af2 masking vvalues for jungfrau Dhanya Maliakal 2015-11-27 17:32:46 +01:00
• b803f3a32a works for jungfrau Dhanya Maliakal 2015-11-27 17:30:45 +01:00
• 6498292ee4 max packets per file forgotten at 5 Dhanya Maliakal 2015-11-27 17:09:33 +01:00
• 74b1baa9d8 solved packet loss problem Dhanya Maliakal 2015-11-27 17:07:57 +01:00
• 3b0e2e611c jungfrau works Dhanya Maliakal 2015-11-27 15:57:19 +01:00
• 0958a4544e jungfrau works Dhanya Maliakal 2015-11-27 15:56:29 +01:00