Skip to content

Commit f8f51ba

Browse files
matthewstortinimatthewstortini
authored
Merge pull request #68 from Mu2e/eflumerf/RemoveUPS
Remove UPS configuration. Update CMake Target specifications
2 parents 494e88e + 082d7f4 commit f8f51ba

File tree

125 files changed

+14155
-12144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+14155
-12144
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
99
find_package(cetmodules)
1010

11-
project(otsdaq_mu2e_tracker VERSION 3.04.00)
11+
project(otsdaq-mu2e-tracker VERSION 3.04.00)
1212

1313
include(CetCMakeEnv)
1414
cet_cmake_env()
@@ -24,10 +24,10 @@ cet_set_compiler_flags(
2424
# it looks that these packages are looked for only after cet_cmake_env
2525
#------------------------------------------------------------------------------
2626
find_package(artdaq 3.12.07 REQUIRED EXPORT)
27-
find_package(artdaq_core 3.09.16 REQUIRED EXPORT)
28-
find_package(artdaq_core_demo 1.11.00 REQUIRED EXPORT)
29-
find_package(otsdaq_mu2e 1.02.00 REQUIRED EXPORT)
30-
find_package(mu2e_pcie_utils 3.02.00 REQUIRED EXPORT)
27+
find_package(artdaq-core 3.09.16 REQUIRED EXPORT)
28+
find_package(artdaq-core-demo 1.11.00 REQUIRED EXPORT)
29+
find_package(otsdaq-mu2e 1.02.00 REQUIRED EXPORT)
30+
find_package(mu2e-pcie-utils 3.02.00 REQUIRED EXPORT)
3131

3232
# message("---------- otsdaq-mu2e-tracker: PRINT CMAKE VARIABLES " )
3333
#

‎config/ejc/mu2edaq22.C‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
///////////////////////////////////////////////////////////////////////////////
22
// mu2edaq22 : not checked, see mu2edaq09.C for reference
33
// ---------
4-
// init_run_configuration : the name and the call signature are is fixed
4+
// init_run_configuration : the name and the call signature are is fixed
55
// and can't be changed
66
// this is an example of why one can't just use DTCLIB_DTC - there are two of them
77
///////////////////////////////////////////////////////////////////////////////
88
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
99

10-
int init_run_configuration(DtcGui* X) {
11-
int rc(0);
10+
int init_run_configuration(DtcGui* X)
11+
{
12+
int rc(0);
1213

13-
printf("[init_run_configuration] : test : DtcGui : %s\n",gSystem->Getenv("HOSTNAME"));
14+
printf("[init_run_configuration] : test : DtcGui : %s\n",
15+
gSystem->Getenv("HOSTNAME"));
1416

15-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
17+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1618

17-
X->fNDtcs = 1; // installed on a machine
19+
X->fNDtcs = 1; // installed on a machine
1820

19-
dtc[0].fName = "DTC";
20-
dtc[0].fPcieAddr = 0;
21-
dtc[0].fLinkMask = 0x1; // ROC0
21+
dtc[0].fName = "DTC";
22+
dtc[0].fPcieAddr = 0;
23+
dtc[0].fLinkMask = 0x1; // ROC0
2224

23-
gSystem->Setenv("DTCLIB_DTC","0");
25+
gSystem->Setenv("DTCLIB_DTC", "0");
2426

25-
return rc;
27+
return rc;
2628
}

‎config/pasha/mu2edaq07_pcie0.C‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
///////////////////////////////////////////////////////////////////////////////
22
// mu2edaq22 : DTC0: ROC tower
3-
// init_run_configuration : the name and the call signature are is fixed
3+
// init_run_configuration : the name and the call signature are is fixed
44
// and can't be changed
55
///////////////////////////////////////////////////////////////////////////////
66
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
7-
int init_run_configuration(DtcGui* X) {
8-
int rc(0);
7+
int init_run_configuration(DtcGui* X)
8+
{
9+
int rc(0);
910

10-
printf("[init_run_configuration] : host:%s\n",gSystem->Getenv("HOSTNAME"));
11+
printf("[init_run_configuration] : host:%s\n", gSystem->Getenv("HOSTNAME"));
1112

12-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
13+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1314

14-
X->fNDtcs = 1; // 2; // installed on a machine
15+
X->fNDtcs = 1; // 2; // installed on a machine
1516

16-
// dtc[0].fName = "CFO";
17-
// dtc[0].fPcieAddr = 0;
18-
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
19-
// gSystem->Setenv("CFOLIB_CFO","0");
17+
// dtc[0].fName = "CFO";
18+
// dtc[0].fPcieAddr = 0;
19+
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
20+
// gSystem->Setenv("CFOLIB_CFO","0");
2021

21-
dtc[0].fName = "DTC";
22-
dtc[0].fPcieAddr = 0;
23-
// dtc[0].fLinkMask = 0x000001; // ROC0
24-
dtc[0].fLinkMask = 0x111111; // 6 ROCs
25-
dtc[0].fReadoutMode = 0; // 0:patterns 1:digis
26-
dtc[0].fJAMode = 0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
27-
dtc[0].fEmulateCfo = 1; //
22+
dtc[0].fName = "DTC";
23+
dtc[0].fPcieAddr = 0;
24+
// dtc[0].fLinkMask = 0x000001; // ROC0
25+
dtc[0].fLinkMask = 0x111111; // 6 ROCs
26+
dtc[0].fReadoutMode = 0; // 0:patterns 1:digis
27+
dtc[0].fJAMode =
28+
0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
29+
dtc[0].fEmulateCfo = 1; //
2830

29-
dtc[0].fDtcID = 7; // for one machine, make it the same as the PcieAddr
30-
dtc[0].fPartitionID = 0;
31-
dtc[0].fEventMode = 0;
32-
dtc[0].fMacAddrByte = 0;
31+
dtc[0].fDtcID = 7; // for one machine, make it the same as the PcieAddr
32+
dtc[0].fPartitionID = 0;
33+
dtc[0].fEventMode = 0;
34+
dtc[0].fMacAddrByte = 0;
3335

34-
gSystem->Setenv("DTCLIB_DTC","0");
36+
gSystem->Setenv("DTCLIB_DTC", "0");
3537

36-
return rc;
38+
return rc;
3739
}

‎config/pasha/mu2edaq07_pcie1.C‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
///////////////////////////////////////////////////////////////////////////////
2-
// mu2edaq22 :
3-
// init_run_configuration : the name and the call signature are is fixed
2+
// mu2edaq22 :
3+
// init_run_configuration : the name and the call signature are is fixed
44
// and can't be changed
55
///////////////////////////////////////////////////////////////////////////////
66
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
7-
int init_run_configuration(DtcGui* X) {
8-
int rc(0);
7+
int init_run_configuration(DtcGui* X)
8+
{
9+
int rc(0);
910

10-
printf("[init_run_configuration] : host:%s\n",gSystem->Getenv("HOSTNAME"));
11+
printf("[init_run_configuration] : host:%s\n", gSystem->Getenv("HOSTNAME"));
1112

12-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
13+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1314

14-
X->fNDtcs = 1; // 2; // installed on a machine
15+
X->fNDtcs = 1; // 2; // installed on a machine
1516

16-
// dtc[0].fName = "CFO";
17-
// dtc[0].fPcieAddr = 0;
18-
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
19-
// gSystem->Setenv("CFOLIB_CFO","0");
17+
// dtc[0].fName = "CFO";
18+
// dtc[0].fPcieAddr = 0;
19+
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
20+
// gSystem->Setenv("CFOLIB_CFO","0");
2021

21-
dtc[0].fName = "DTC";
22-
dtc[0].fPcieAddr = 1;
23-
dtc[0].fLinkMask = 0x011; // TS2 (0x10) +TS1
24-
dtc[0].fJAMode = 0x01;
25-
dtc[0].fReadoutMode = 1; // 0:patterns 1:digis
22+
dtc[0].fName = "DTC";
23+
dtc[0].fPcieAddr = 1;
24+
dtc[0].fLinkMask = 0x011; // TS2 (0x10) +TS1
25+
dtc[0].fJAMode = 0x01;
26+
dtc[0].fReadoutMode = 1; // 0:patterns 1:digis
2627

27-
dtc[0].fDtcID = 1; // for 1 node, make it the same as PcieAddr
28-
dtc[0].fPartitionID = 0;
29-
dtc[0].fEventMode = 0;
30-
dtc[0].fMacAddrByte = 0;
31-
32-
gSystem->Setenv("DTCLIB_DTC","1");
28+
dtc[0].fDtcID = 1; // for 1 node, make it the same as PcieAddr
29+
dtc[0].fPartitionID = 0;
30+
dtc[0].fEventMode = 0;
31+
dtc[0].fMacAddrByte = 0;
3332

34-
return rc;
33+
gSystem->Setenv("DTCLIB_DTC", "1");
34+
35+
return rc;
3536
}

‎config/pasha/mu2edaq09_pcie0.C‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
11
///////////////////////////////////////////////////////////////////////////////
2-
// mu2edaq09/pcie0 :
3-
// init_run_configuration : the name and the call signature are is fixed
2+
// mu2edaq09/pcie0 :
3+
// init_run_configuration : the name and the call signature are is fixed
44
// and can't be changed
55
///////////////////////////////////////////////////////////////////////////////
66
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
7-
int init_run_configuration(DtcGui* X) {
8-
int rc(0);
7+
int init_run_configuration(DtcGui* X)
8+
{
9+
int rc(0);
910

10-
printf("[init_run_configuration] : test : host:%s\n",gSystem->Getenv("HOSTNAME"));
11+
printf("[init_run_configuration] : test : host:%s\n", gSystem->Getenv("HOSTNAME"));
1112

12-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
13+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1314

14-
X->fNDtcs = 1; // 2; // installed on a machine
15+
X->fNDtcs = 1; // 2; // installed on a machine
1516

16-
dtc[0].fName = "DTC" ; // "CFO";
17-
dtc[0].fPcieAddr = 0;
18-
dtc[0].fLinkMask = 0x111111; // start from 2 DTCs on link0
19-
// dtc[0].fLinkMask = 0x0010; // MN180
20-
// dtc[0].fLinkMask = 0x1000; // MN162
21-
// dtc[0].fLinkMask = 0x1001; // MN234+MN162
22-
dtc[0].fJAMode = 0x01; // no ext clock
23-
//gSystem->Setenv("CFOLIB_CFO","0");
17+
dtc[0].fName = "DTC"; // "CFO";
18+
dtc[0].fPcieAddr = 0;
19+
dtc[0].fLinkMask = 0x111111; // start from 2 DTCs on link0
20+
// dtc[0].fLinkMask = 0x0010; // MN180
21+
// dtc[0].fLinkMask = 0x1000; // MN162
22+
// dtc[0].fLinkMask = 0x1001; // MN234+MN162
23+
dtc[0].fJAMode = 0x01; // no ext clock
24+
// gSystem->Setenv("CFOLIB_CFO","0");
2425

25-
dtc[0].fDtcID = 0; // for one machine, make it the same as the PcieAddr
26-
dtc[0].fPartitionID = 0;
27-
dtc[0].fEventMode = 1;
28-
dtc[0].fMacAddrByte = 0;
26+
dtc[0].fDtcID = 0; // for one machine, make it the same as the PcieAddr
27+
dtc[0].fPartitionID = 0;
28+
dtc[0].fEventMode = 1;
29+
dtc[0].fMacAddrByte = 0;
2930

30-
gSystem->Setenv("DTCLIB_DTC","0");
31+
gSystem->Setenv("DTCLIB_DTC", "0");
3132

32-
// dtc[0].fName = "DTC";
33-
// dtc[0].fPcieAddr = 1;
34-
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
35-
// gSystem->Setenv("DTCLIB_DTC","1");
33+
// dtc[0].fName = "DTC";
34+
// dtc[0].fPcieAddr = 1;
35+
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
36+
// gSystem->Setenv("DTCLIB_DTC","1");
3637

37-
return rc;
38+
return rc;
3839
}

‎config/pasha/mu2edaq09_pcie1.C‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
///////////////////////////////////////////////////////////////////////////////
2-
// mu2edaq09/pcie1 :
3-
// init_run_configuration : the name and the call signature are is fixed
2+
// mu2edaq09/pcie1 :
3+
// init_run_configuration : the name and the call signature are is fixed
44
// and can't be changed
55
///////////////////////////////////////////////////////////////////////////////
66
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
7-
int init_run_configuration(DtcGui* X) {
8-
int rc(0);
7+
int init_run_configuration(DtcGui* X)
8+
{
9+
int rc(0);
910

10-
printf("[init_run_configuration] : test : host:%s\n",gSystem->Getenv("HOSTNAME"));
11+
printf("[init_run_configuration] : test : host:%s\n", gSystem->Getenv("HOSTNAME"));
1112

12-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
13+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1314

14-
X->fNDtcs = 1; // 2; // installed on a machine
15+
X->fNDtcs = 1; // 2; // installed on a machine
1516

16-
dtc[0].fName = "DTC" ; // "CFO";
17-
dtc[0].fPcieAddr = 1;
18-
// dtc[0].fLinkMask = 0x11111; // start from 2 DTCs on link0
19-
// dtc[0].fLinkMask = 0x11111; // can read 3 ROCs
20-
dtc[0].fLinkMask = 0x111111 ; // leave only 2,
21-
dtc[0].fJAMode = 0x01; // no ext clock
22-
//gSystem->Setenv("CFOLIB_CFO","0");
17+
dtc[0].fName = "DTC"; // "CFO";
18+
dtc[0].fPcieAddr = 1;
19+
// dtc[0].fLinkMask = 0x11111; // start from 2 DTCs on link0
20+
// dtc[0].fLinkMask = 0x11111; // can read 3 ROCs
21+
dtc[0].fLinkMask = 0x111111; // leave only 2,
22+
dtc[0].fJAMode = 0x01; // no ext clock
23+
// gSystem->Setenv("CFOLIB_CFO","0");
2324

24-
dtc[0].fDtcID = 1; // for one machine, make it the same as the PcieAddr
25-
dtc[0].fPartitionID = 0;
26-
dtc[0].fEventMode = 0;
27-
dtc[0].fMacAddrByte = 0;
25+
dtc[0].fDtcID = 1; // for one machine, make it the same as the PcieAddr
26+
dtc[0].fPartitionID = 0;
27+
dtc[0].fEventMode = 0;
28+
dtc[0].fMacAddrByte = 0;
2829

29-
gSystem->Setenv("DTCLIB_DTC","1");
30+
gSystem->Setenv("DTCLIB_DTC", "1");
3031

31-
// dtc[0].fName = "DTC";
32-
// dtc[0].fPcieAddr = 1;
33-
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
34-
// gSystem->Setenv("DTCLIB_DTC","1");
32+
// dtc[0].fName = "DTC";
33+
// dtc[0].fPcieAddr = 1;
34+
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
35+
// gSystem->Setenv("DTCLIB_DTC","1");
3536

36-
return rc;
37+
return rc;
3738
}

‎config/pasha/mu2edaq22_pcie0.C‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
///////////////////////////////////////////////////////////////////////////////
22
// mu2edaq22 : DTC0: ROC tower
3-
// init_run_configuration : the name and the call signature are is fixed
3+
// init_run_configuration : the name and the call signature are is fixed
44
// and can't be changed
55
///////////////////////////////////////////////////////////////////////////////
66
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
7-
int init_run_configuration(DtcGui* X) {
8-
int rc(0);
7+
int init_run_configuration(DtcGui* X)
8+
{
9+
int rc(0);
910

10-
printf("[init_run_configuration] : host:%s\n",gSystem->Getenv("HOSTNAME"));
11+
printf("[init_run_configuration] : host:%s\n", gSystem->Getenv("HOSTNAME"));
1112

12-
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
13+
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;
1314

14-
X->fNDtcs = 1; // 2; // installed on a machine
15+
X->fNDtcs = 1; // 2; // installed on a machine
1516

16-
// dtc[0].fName = "CFO";
17-
// dtc[0].fPcieAddr = 0;
18-
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
19-
// gSystem->Setenv("CFOLIB_CFO","0");
17+
// dtc[0].fName = "CFO";
18+
// dtc[0].fPcieAddr = 0;
19+
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
20+
// gSystem->Setenv("CFOLIB_CFO","0");
2021

21-
dtc[0].fName = "DTC";
22-
dtc[0].fPcieAddr = 0;
23-
// dtc[0].fLinkMask = 0x111111; // 6 ROCs
24-
dtc[0].fLinkMask = 0x000010; // TS1 : ROC1@DTC0
25-
dtc[0].fRocReadoutMode = 0; // 0:patterns 1:digis
26-
dtc[0].fRocLaneMask = 0xf; // 0:patterns 1:digis
27-
dtc[0].fROcNHitsPerLane = 10; // for mode=2;
28-
29-
dtc[0].fJAMode = 0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
30-
dtc[0].fEmulateCfo = 1; //
22+
dtc[0].fName = "DTC";
23+
dtc[0].fPcieAddr = 0;
24+
// dtc[0].fLinkMask = 0x111111; // 6 ROCs
25+
dtc[0].fLinkMask = 0x000010; // TS1 : ROC1@DTC0
26+
dtc[0].fRocReadoutMode = 0; // 0:patterns 1:digis
27+
dtc[0].fRocLaneMask = 0xf; // 0:patterns 1:digis
28+
dtc[0].fROcNHitsPerLane = 10; // for mode=2;
3129

32-
dtc[0].fDtcID = 44; // for one machine, make it the same as the PcieAddr
33-
dtc[0].fPartitionID = 0;
34-
dtc[0].fEventMode = 1;
35-
dtc[0].fOnSpill = 1;
36-
dtc[0].fMacAddrByte = -1;
30+
dtc[0].fJAMode =
31+
0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
32+
dtc[0].fEmulateCfo = 1; //
3733

38-
gSystem->Setenv("DTCLIB_DTC","0");
34+
dtc[0].fDtcID = 44; // for one machine, make it the same as the PcieAddr
35+
dtc[0].fPartitionID = 0;
36+
dtc[0].fEventMode = 1;
37+
dtc[0].fOnSpill = 1;
38+
dtc[0].fMacAddrByte = -1;
3939

40-
return rc;
40+
gSystem->Setenv("DTCLIB_DTC", "0");
41+
42+
return rc;
4143
}

0 commit comments

Comments
 (0)