Skip to content

Remove UPS configuration. Update CMake Target specifications #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewstortini merged 7 commits into from
Mar 18, 2025
Merged

Remove UPS configuration. Update CMake Target specifications #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc947bb
Remove ups directory and CMakePresets.json that may refer to it. Chan…
eflumerf Feb 12, 2025
86fb2ec
Run clang-format
eflumerf Feb 24, 2025
24864f3
Fix git-whitespace check errors
eflumerf Feb 24, 2025
fd4b173
Run clang-format on all source files
eflumerf Feb 24, 2025
98dfcad
Merge branch 'develop' into eflumerf/RemoveUPS
eflumerf Mar 4, 2025
6bcc626
Merge remote-tracking branch 'origin/eflumerf/FixWhitespace' into efl…
eflumerf Mar 4, 2025
082d7f4
Update changed files, make sure dashes are used
eflumerf Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
find_package(cetmodules)

project(otsdaq_mu2e_tracker VERSION 3.04.00)
project(otsdaq-mu2e-tracker VERSION 3.04.00)

include(CetCMakeEnv)
cet_cmake_env()
Expand All @@ -24,10 +24,10 @@ cet_set_compiler_flags(
# it looks that these packages are looked for only after cet_cmake_env
#------------------------------------------------------------------------------
find_package(artdaq 3.12.07 REQUIRED EXPORT)
find_package(artdaq_core 3.09.16 REQUIRED EXPORT)
find_package(artdaq_core_demo 1.11.00 REQUIRED EXPORT)
find_package(otsdaq_mu2e 1.02.00 REQUIRED EXPORT)
find_package(mu2e_pcie_utils 3.02.00 REQUIRED EXPORT)
find_package(artdaq-core 3.09.16 REQUIRED EXPORT)
find_package(artdaq-core-demo 1.11.00 REQUIRED EXPORT)
find_package(otsdaq-mu2e 1.02.00 REQUIRED EXPORT)
find_package(mu2e-pcie-utils 3.02.00 REQUIRED EXPORT)

# message("---------- otsdaq-mu2e-tracker: PRINT CMAKE VARIABLES " )
#
Expand Down
24 changes: 13 additions & 11 deletions config/ejc/mu2edaq22.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq22 : not checked, see mu2edaq09.C for reference
// ---------
// init_run_configuration : the name and the call signature are is fixed
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
// this is an example of why one can't just use DTCLIB_DTC - there are two of them
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"

int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // installed on a machine
X->fNDtcs = 1; // installed on a machine

dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 0;
dtc[0].fLinkMask = 0x1; // ROC0
dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 0;
dtc[0].fLinkMask = 0x1; // ROC0

gSystem->Setenv("DTCLIB_DTC","0");
gSystem->Setenv("DTCLIB_DTC", "0");

return rc;
return rc;
}
48 changes: 25 additions & 23 deletions config/pasha/mu2edaq07_pcie0.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq22 : DTC0: ROC tower
// init_run_configuration : the name and the call signature are is fixed
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // 2; // installed on a machine
X->fNDtcs = 1; // 2; // installed on a machine

// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");
// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");

dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x000001; // ROC0
dtc[0].fLinkMask = 0x111111; // 6 ROCs
dtc[0].fReadoutMode = 0; // 0:patterns 1:digis
dtc[0].fJAMode = 0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
dtc[0].fEmulateCfo = 1; //
dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x000001; // ROC0
dtc[0].fLinkMask = 0x111111; // 6 ROCs
dtc[0].fReadoutMode = 0; // 0:patterns 1:digis
dtc[0].fJAMode =
0x01; // ROC tower@IERC: external clock (internal_clock << 4) + reset
dtc[0].fEmulateCfo = 1; //

dtc[0].fDtcID = 7; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;
dtc[0].fDtcID = 7; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;

gSystem->Setenv("DTCLIB_DTC","0");
gSystem->Setenv("DTCLIB_DTC", "0");

return rc;
return rc;
}
47 changes: 24 additions & 23 deletions config/pasha/mu2edaq07_pcie1.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq22 :
// init_run_configuration : the name and the call signature are is fixed
// mu2edaq22 :
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // 2; // installed on a machine
X->fNDtcs = 1; // 2; // installed on a machine

// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");
// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");

dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 1;
dtc[0].fLinkMask = 0x011; // TS2 (0x10) +TS1
dtc[0].fJAMode = 0x01;
dtc[0].fReadoutMode = 1; // 0:patterns 1:digis
dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 1;
dtc[0].fLinkMask = 0x011; // TS2 (0x10) +TS1
dtc[0].fJAMode = 0x01;
dtc[0].fReadoutMode = 1; // 0:patterns 1:digis

dtc[0].fDtcID = 1; // for 1 node, make it the same as PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;

gSystem->Setenv("DTCLIB_DTC","1");
dtc[0].fDtcID = 1; // for 1 node, make it the same as PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;

return rc;
gSystem->Setenv("DTCLIB_DTC", "1");

return rc;
}
51 changes: 26 additions & 25 deletions config/pasha/mu2edaq09_pcie0.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq09/pcie0 :
// init_run_configuration : the name and the call signature are is fixed
// mu2edaq09/pcie0 :
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // 2; // installed on a machine
X->fNDtcs = 1; // 2; // installed on a machine

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

dtc[0].fDtcID = 0; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 1;
dtc[0].fMacAddrByte = 0;
dtc[0].fDtcID = 0; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 1;
dtc[0].fMacAddrByte = 0;

gSystem->Setenv("DTCLIB_DTC","0");
gSystem->Setenv("DTCLIB_DTC", "0");

// dtc[0].fName = "DTC";
// dtc[0].fPcieAddr = 1;
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
// gSystem->Setenv("DTCLIB_DTC","1");
// dtc[0].fName = "DTC";
// dtc[0].fPcieAddr = 1;
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
// gSystem->Setenv("DTCLIB_DTC","1");

return rc;
return rc;
}
49 changes: 25 additions & 24 deletions config/pasha/mu2edaq09_pcie1.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq09/pcie1 :
// init_run_configuration : the name and the call signature are is fixed
// mu2edaq09/pcie1 :
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // 2; // installed on a machine
X->fNDtcs = 1; // 2; // installed on a machine

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

dtc[0].fDtcID = 1; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;
dtc[0].fDtcID = 1; // for one machine, make it the same as the PcieAddr
dtc[0].fPartitionID = 0;
dtc[0].fEventMode = 0;
dtc[0].fMacAddrByte = 0;

gSystem->Setenv("DTCLIB_DTC","1");
gSystem->Setenv("DTCLIB_DTC", "1");

// dtc[0].fName = "DTC";
// dtc[0].fPcieAddr = 1;
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
// gSystem->Setenv("DTCLIB_DTC","1");
// dtc[0].fName = "DTC";
// dtc[0].fPcieAddr = 1;
// dtc[0].fLinkMask = 0x111; // ROC0 and ROC1
// gSystem->Setenv("DTCLIB_DTC","1");

return rc;
return rc;
}
56 changes: 29 additions & 27 deletions config/pasha/mu2edaq22_pcie0.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
///////////////////////////////////////////////////////////////////////////////
// mu2edaq22 : DTC0: ROC tower
// init_run_configuration : the name and the call signature are is fixed
// init_run_configuration : the name and the call signature are is fixed
// and can't be changed
///////////////////////////////////////////////////////////////////////////////
#include "otsdaq-mu2e-tracker/Gui/DtcGui.hh"
int init_run_configuration(DtcGui* X) {
int rc(0);
int init_run_configuration(DtcGui* X)
{
int rc(0);

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

DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*) X->fDtcData;
DtcGui::DtcData_t* dtc = (DtcGui::DtcData_t*)X->fDtcData;

X->fNDtcs = 1; // 2; // installed on a machine
X->fNDtcs = 1; // 2; // installed on a machine

// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");
// dtc[0].fName = "CFO";
// dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x2; // 2 DTCs on link0
// gSystem->Setenv("CFOLIB_CFO","0");

dtc[0].fName = "DTC";
dtc[0].fPcieAddr = 0;
// dtc[0].fLinkMask = 0x111111; // 6 ROCs
dtc[0].fLinkMask = 0x000010; // TS1 : ROC1@DTC0
dtc[0].fRocReadoutMode = 0; // 0:patterns 1:digis
dtc[0].fRocLaneMask = 0xf; // 0:patterns 1:digis
dtc[0].fROcNHitsPerLane = 10; // for mode=2;

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

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

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

return rc;
gSystem->Setenv("DTCLIB_DTC", "0");

return rc;
}
Loading
Loading