Commit b03b357b authored by Computing Division's avatar Computing Division
Browse files

Changed makefiles for otsdaq

parent 2d34a7b8
......@@ -228,13 +228,9 @@ else() # ------------------------------- Compilation in the otsdaq environment -
MESSAGE (STATUS "${CMAKE_CXX_FLAGS}")
set(CompileForShep "$ENV{CompileForShep}")
set(CompileForHerd "$ENV{CompileForHerd}")
if ((NOT CompileForShep) AND (NOT CompileForHerd))
set(NoDataShipping true)
else()
set(NoDataShipping false)
endif()
set(CompileForShep true)
set(CompileForHerd false)
set(NoDataShipping false)
# AMC13
if(${CACTUS_AMC13_FOUND})
......
......@@ -139,7 +139,14 @@ else()
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/log/include)
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/grammars/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories($ENV{PH2ACF_BASE_DIR}/HWDescription)
include_directories($ENV{PH2ACF_BASE_DIR}/HWInterface)
include_directories($ENV{PH2ACF_BASE_DIR}/Utils)
include_directories($ENV{PH2ACF_BASE_DIR}/tools)
include_directories($ENV{PH2ACF_BASE_DIR}/ProductionTools)
include_directories($ENV{PH2ACF_BASE_DIR}/DQMUtils)
include_directories($ENV{PH2ACF_BASE_DIR}/System)
cet_set_compiler_flags(
EXTRA_FLAGS -Wno-reorder -Wl,--undefined
......@@ -149,7 +156,6 @@ else()
LIBRARIES
pthread
${Boost_SYSTEM_LIBRARY}
EXCLUDE RD53eudaqProducer.h RD53eudaqProducer.cc
)
install_headers()
......
......@@ -8,6 +8,7 @@
*/
#include "RD53EyeDiag.h"
#include "../Utils/ContainerFactory.h"
#ifdef __POWERSUPPLY__
// Libraries
#include "Scope.h"
......
......@@ -8,6 +8,8 @@
*/
#include "RD53EyeScanOptimization.h"
#include "../Utils/ContainerFactory.h"
using namespace Ph2_HwDescription;
using namespace Ph2_HwInterface;
......
......@@ -158,10 +158,12 @@ void FileParser::parseBeBoard(pugi::xml_node pBeBordNode, BeBoardFWMap& pBeBoard
std::string cUri = cBeBoardConnectionNode.attribute("uri").value();
std::string cAddressTable = expandEnvironmentVariables(cBeBoardConnectionNode.attribute("address_table").value());
if(cBeBoard->getBoardType() == BoardType::D19C) { pBeBoardFWMap[cBeBoard->getId()] = new D19cFWInterface(cId.c_str(), cUri.c_str(), cAddressTable.c_str()); }
else if(cBeBoard->getBoardType() == BoardType::RD53)
pBeBoardFWMap[cBeBoard->getId()] = new RD53FWInterface(cId.c_str(), cUri.c_str(), cAddressTable.c_str());
if(fEnableInterfaces)
{
if(cBeBoard->getBoardType() == BoardType::D19C) { pBeBoardFWMap[cBeBoard->getId()] = new D19cFWInterface(cId.c_str(), cUri.c_str(), cAddressTable.c_str()); }
else if(cBeBoard->getBoardType() == BoardType::RD53)
pBeBoardFWMap[cBeBoard->getId()] = new RD53FWInterface(cId.c_str(), cUri.c_str(), cAddressTable.c_str());
}
os << BOLDCYAN << "|"
<< " "
<< "|"
......
......@@ -54,6 +54,7 @@ class FileParser
void parseHW(const std::string& pFilename, BeBoardFWMap& pBeBoardFWMap, DetectorContainer* pDetectorContainer, std::ostream& os, bool pIsFile);
void parseSettings(const std::string& pFilename, SettingsMap& pSettingsMap, std::ostream& os, bool pIsFile);
std::string parseMonitor(const std::string& pFilename, DetectorMonitorConfig& theDetectorMonitorConfig, std::ostream& os, bool pIsFile);
void disableInterfaces() {fEnableInterfaces = false;}
protected:
/*!
......@@ -125,6 +126,9 @@ class FileParser
{18, "MaskChannel-152-to-145"}, {19, "MaskChannel-160-to-153"}, {20, "MaskChannel-168-to-161"}, {21, "MaskChannel-176-to-169"}, {22, "MaskChannel-184-to-177"}, {23, "MaskChannel-192-to-185"},
{24, "MaskChannel-200-to-193"}, {25, "MaskChannel-208-to-201"}, {26, "MaskChannel-216-to-209"}, {27, "MaskChannel-224-to-217"}, {28, "MaskChannel-232-to-225"}, {29, "MaskChannel-240-to-233"},
{30, "MaskChannel-248-to-241"}, {31, "MaskChannel-254-to-249"}};
private:
bool fEnableInterfaces {true};
};
} // namespace Ph2_System
......
......@@ -73,6 +73,7 @@ else()
MESSAGE(STATUS " ")
#include_directories(${UHAL_UHAL_INCLUDE_PREFIX})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/uhal/include)
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/log/include)
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/grammars/include)
......
......@@ -128,7 +128,7 @@ else() # ------------------------------- Compilation in the otsdaq environment -
${Boost_REGEX_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${ROOT_BASIC_LIB_LIST}
#${ROOT_BASIC_LIB_LIST}
cactus_uhal_uhal
cactus_uhal_log
cactus_uhal_grammars
......
......@@ -146,6 +146,7 @@ else()
MESSAGE(STATUS " ${BoldYellow}MIDDLEWARE${Reset} [otsdaq/middleware]: [${BoldCyan}Ph2_ACF/tools/CMakeLists.txt${Reset}]. ${BoldRed}Begin...${Reset}")
MESSAGE(STATUS " ")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/uhal/include)
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/log/include)
include_directories($ENV{OTSDAQ_CMSOUTERTRACKER_DIR}/uhal/uhal_2_7_5/uhal/grammars/include)
......@@ -160,7 +161,10 @@ else()
LIBRARIES
pthread
${Boost_SYSTEM_LIBRARY}
EXCLUDE RD53eudaqProducer.h RD53eudaqProducer.cc
EXCLUDE
RD53eudaqProducer.h RD53eudaqProducer.cc
SEHTester.h SEHTester.cc
SSAPhysics.h SSAPhysics.cc
)
install_headers()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment