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

• 7b3bc86678 a weird merge had a return ok in the end of retreievedetector l_maliakal_d 2012-03-16 15:24:12 +00:00
• 6a49d8a6df updated the updatedetector function for gotthard l_maliakal_d 2012-03-16 15:23:34 +00:00
• bb12fe77d3 edited the updatedetector function l_maliakal_d 2012-03-16 15:22:43 +00:00
• af864279a5 added loadimage function l_maliakal_d 2012-03-16 13:06:28 +00:00
• 2076fb75f5 ll l_maliakal_d 2012-03-16 13:05:38 +00:00
• 794ab4fdfc updated the master, settiming, setextsig, setfpgasignal, synchronization functions l_maliakal_d 2012-03-16 12:55:01 +00:00
• d8d08d5a9b solved segmentation fault on may frames, printing progress during acquisition bergamaschi 2012-03-16 12:25:45 +00:00
• 97a0d06618 string length on the scansteps command corrected bergamaschi 2012-03-15 15:15:54 +00:00
• d58ccf9c1e compilation warnings (unused variables, no return value for non void functions etc.) removed bergamaschi 2012-03-15 13:47:50 +00:00
• 584e99b1b7 weird change added to master while merging l_maliakal_d 2012-03-15 10:02:22 +00:00
• 4b296b6b7d Should now work also for multiple frames and positions bergamaschi 2012-03-15 09:59:40 +00:00
• 14bc483310 couldnt commit changes, tried to merge, probably messy l_maliakal_d 2012-03-15 09:57:20 +00:00
• c2846e72e7 changed fifo_data address, made fifo related stuff volatile, changed makefile to incorporate compiling image and program simultaneously l_maliakal_d 2012-03-15 08:26:10 +00:00
• 7c07ae5a5a after some debugging at the beamline x04sa 2012-03-09 14:40:10 +00:00
• b070938f57 versions at the beamline bergamaschi 2012-03-08 08:23:33 +00:00
• 461fd8824f Raw data file write/read now uses absolute channel values in multidetector systems. Flat field and bad channel corrections and angular conversion debugged bergamaschi 2012-03-02 11:01:53 +00:00
• 5e086b9ee6 timing command added, several bugs concerning the synchronization of multiple detectors fixed bergamaschi 2012-02-28 13:59:28 +00:00
• b755c533f0 timing functions changed bergamaschi 2012-02-27 16:29:40 +00:00
• 1064bd21ff slsDetectorCommand does not inherit slsDetectorBase but rather uses its methods bergamaschi 2012-02-24 15:32:39 +00:00
• c2a24e2c73 changes in the software structure debugged bergamaschi 2012-02-24 13:14:58 +00:00
• e0368c69ee added a testfunction to test start and stop acquisition of gotthard l_maliakal_d 2012-02-21 16:01:13 +00:00
• bd54f179ed status register updates l_maliakal_d 2012-02-21 15:58:58 +00:00
• 4a4e7540ca added digital_test_bit for gotthard l_maliakal_d 2012-02-20 14:00:08 +00:00
• e24a4b79a3 modified configuremac function to have zero arguments l_maliakal_d 2012-02-20 13:59:31 +00:00
• 8e79e5077f modified configuremac function, moved digital test bit to digital test function l_maliakal_d 2012-02-20 13:57:52 +00:00
• 7ed37b2e3f moving digital test bit in configuremac function to the digital test function l_maliakal_d 2012-02-20 13:46:41 +00:00
• 92a61d1441 added the dark/gain image functions and enum l_maliakal_d 2012-02-20 10:06:30 +00:00
• c6f61d3663 added load image, changed key find, changed get temp to getADC l_maliakal_d 2012-02-20 10:05:57 +00:00
• 44eea027f3 fixed dark/gain image correction l_maliakal_d 2012-02-20 10:00:59 +00:00
• 47f18d3cbf adding hostname+ changing that l_maliakal_d 2012-02-17 11:09:51 +00:00
• a7e9cc1091 added the dark and gain image funcitions l_maliakal_d 2012-02-17 10:26:04 +00:00
• 23aea6007b data file read/write now work with both file names and file streams bergamaschi 2012-02-17 10:09:10 +00:00
• a556b2a7da major changes with inheritances bergamaschi 2012-02-17 09:43:46 +00:00
• 6778060b56 changed dynamic range of gotthard, moved get temp to getadc function, added 3 debugging functions just for now l_maliakal_d 2012-02-16 14:23:05 +00:00
• ee2652f864 read_frame works and moved get temp to the getadc function l_maliakal_d 2012-02-16 14:16:38 +00:00
• 2e15e9c2db works but usleep required l_maliakal_d 2012-02-14 10:39:37 +00:00
• ba833233b9 changed the register addresses l_maliakal_d 2012-02-03 15:44:57 +00:00
• 266d13759c a few changes for the fifo_read and the bus_r16 l_maliakal_d 2012-01-30 07:45:05 +00:00
• af2c6b9bb2 named enums in mcb_funcs.h l_maliakal_d 2012-01-23 15:33:19 +00:00
• 094a87ec7b changes for testram which didnt work anyway l_maliakal_d 2012-01-23 15:05:08 +00:00
• 41fea1fbcf fixed testfpga, fixed pattern reg etc l_maliakal_d 2012-01-19 11:05:37 +00:00
• b7bb5a961b fixed fpgaversion etc register problems l_maliakal_d 2012-01-18 18:00:37 +00:00
• 302a70d59b Using myMod-reg for settings for the gotthard l_maliakal_d 2012-01-17 10:48:01 +00:00
• 918bcd3836 settings fixed l_maliakal_d 2012-01-17 10:47:21 +00:00
• 3e8f916561 implemented the read write reg for debugging l_maliakal_d 2012-01-13 17:00:26 +00:00
• 3265f8b483 added the read write reg for debugging l_maliakal_d 2012-01-13 17:00:06 +00:00
• 89c00ffda3 added adc_write to simply write to registers and read back, instead of making more functions l_maliakal_d 2012-01-13 13:53:48 +00:00
• 429bedecca included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization l_maliakal_d 2012-01-13 13:40:58 +00:00
• bbedcbc329 included serverMAC function for gotthard l_maliakal_d 2012-01-13 12:13:07 +00:00
• 8424decb72 complete before adding adcwritereg function from client l_maliakal_d 2012-01-13 11:47:36 +00:00
• e8e1157c1a included serverMAC function for gotthard l_maliakal_d 2012-01-13 11:43:03 +00:00
• e5ab585ab0 included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization l_maliakal_d 2012-01-13 11:41:59 +00:00
• 6abd580f95 commented out stuff to make sure they are not included l_maliakal_d 2012-01-13 09:45:43 +00:00
• fa369ca22f commented out everything to do with out detectors including multislsdetector l_maliakal_d 2012-01-13 09:45:08 +00:00
• 19f7712e65 changes which commented out virtual for child functions and some other changes for configuremac and setclientip and setclientmac l_maliakal_d 2012-01-13 09:44:04 +00:00
• c50716f623 reverted the change: no struct for tse_conf etc in here anymore l_maliakal_d 2012-01-13 09:39:56 +00:00
• f0ec4036be works with gigabit l_maliakal_d 2012-01-13 09:39:02 +00:00
• 9f7fe775e8 works with gigabit l_maliakal_d 2012-01-13 09:38:29 +00:00
• 6b6fe986d4 works with gigabit l_maliakal_d 2012-01-13 09:38:20 +00:00
• af1dab372e works with gigabit l_maliakal_d 2012-01-13 09:38:16 +00:00
• 913d1c5310 works with gigabit l_maliakal_d 2012-01-13 09:33:37 +00:00
• 88d7f7ffd2 added the enet conf structs l_maliakal_d 2012-01-12 08:20:29 +00:00
• 80bbea0b6f done update l_maliakal_d 2012-01-10 17:53:32 +00:00
• fceb4d63f8 before configuremac for errorfree l_maliakal_d 2012-01-10 14:39:21 +00:00
• 20bc38fe1a reverting to before configuremac command for error-free l_maliakal_d 2012-01-10 14:38:29 +00:00
• 784c423b55 changed the Makefile to what it was before l_maliakal_d 2012-01-10 14:36:06 +00:00
• 16bfd722b3 changed a few parameters & nvar for writeConfigurationFile function l_maliakal_d 2012-01-10 14:31:37 +00:00
• 9a93a5f019 all detectors merged into slsDetector bergamaschi 2012-01-10 14:14:52 +00:00
• ef65cc8b54 added the setclientmac function l_maliakal_d 2012-01-10 13:41:53 +00:00
• 1a85d9f691 changed the setClientIP function and included 2 header files for IP validation l_maliakal_d 2012-01-10 09:31:52 +00:00
• 0fd14ad113 a few more changes for phaseshiftonce l_maliakal_d 2012-01-10 09:29:50 +00:00
• d5271ecb46 added the phase shift at power on part l_maliakal_d 2012-01-06 14:06:34 +00:00
• efb30128fd changed RET to RETVAL for setDetectorType function to compile l_maliakal_d 2012-01-06 10:34:08 +00:00
• c7d0330f55 got rid of some parameters in read-write of config file l_maliakal_d 2012-01-06 10:13:16 +00:00
• 77d21d16f9 added the set & get functions for clientIP and clientMAC l_maliakal_d 2012-01-06 10:11:56 +00:00
• 1770045bce Modified upto DAQ reg l_maliakal_d 2012-01-06 10:02:55 +00:00
• c9a314d829 forces update bergamaschi 2011-12-09 15:48:26 +00:00
• a77a6bac21 gotthard: everything done except gigabyte and adcwrite upto now l_maliakal_d 2011-11-29 09:19:35 +00:00
• 15a649c767 gotthard: everything done upto the gigabyte part l_maliakal_d 2011-11-28 17:08:03 +00:00
• 05705a907a gotthard settings name change again l_maliakal_d 2011-11-28 15:18:44 +00:00
• 5c4dfacadb changed name of settings l_maliakal_d 2011-11-28 15:07:01 +00:00
• 5eab29ed13 settings:upto a highgain l_maliakal_d 2011-11-28 15:05:53 +00:00
• 0044bdf0fd gotthard: moving confgain to configuration part l_maliakal_d 2011-11-28 15:02:39 +00:00
• 145de52af3 gotthard: got rid of confgain as a parameter read from settings file l_maliakal_d 2011-11-28 15:01:02 +00:00
• cd28aaa350 gotthard: changed settings names l_maliakal_d 2011-11-28 12:56:37 +00:00
• 57b892267a gotthard a few changes l_maliakal_d 2011-11-28 12:52:47 +00:00
• 4cbd9b2265 server locking flag (not real lock), last client vs this client, change port implemented, most funcs of the multidetector implemented again bergamaschi 2011-11-25 15:33:25 +00:00
• f1654363e0 interchanged both the temp_adc and temp_fpga values, since they were reading alternate values l_maliakal_d 2011-11-25 10:55:22 +00:00
• fdeba63bff added the confgain parameter of gotthard and changed the MYTHEN part of setsettings that I had commented out earlier l_maliakal_d 2011-11-25 10:10:02 +00:00
• 05aaefb8f0 temp, confgain and hv works well, temp is alternate though l_maliakal_d 2011-11-24 15:54:26 +00:00
• 9f85175dce adding conf gain member to sls detector and change a bit in setSettings to read this back l_maliakal_d 2011-11-22 17:55:17 +00:00
• 7de31bbe93 highvoltage again l_maliakal_d 2011-11-22 17:19:58 +00:00
• 798ff206c1 gotthard:sls_detector_defs:changed a comment l_maliakal_d 2011-11-22 15:09:20 +00:00
• 39d9ae8b7b gotthard:highvoltage done l_maliakal_d 2011-11-22 15:08:48 +00:00
• 1ecde6beeb gotthard: got rid of HV in settings file and changing the way macadd read from settings file l_maliakal_d 2011-11-22 11:01:27 +00:00
• b2723feb47 changed a few things in gotthardDetector.cpp and added 2 members to sls_detector_module in slsdetector.cpp to incorporate gotthards need of client ip address and client mac address to send data l_maliakal_d 2011-11-21 16:11:28 +00:00
• 19e2f2ef60 gotthard: temp readable l_maliakal_d 2011-11-18 17:04:58 +00:00
• e4495f2bf4 gotthard:adding the temperature in the client part and getting rid of gettemperature,gotthardString functions l_maliakal_d 2011-11-18 16:59:18 +00:00
• 40e945889c gotthard:incorporated the temperature read l_maliakal_d 2011-11-18 16:56:14 +00:00
• fc07eee532 added some registers l_maliakal_d 2011-11-18 12:54:59 +00:00