Skip to content
This repository has been archived by the owner on Jan 31, 2022. It is now read-only.

Hw access optimization #327

Merged
merged 15 commits into from
Apr 6, 2020
Merged

Hw access optimization #327

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fd13d33
Refactoring FSM transitions, still temporary
mexanick Feb 27, 2020
c71e77c
Another drop of obsolete FW support
mexanick Mar 18, 2020
2e97321
Removing obsolete legacy (GLIB) support and fixing minor typos
mexanick Mar 18, 2020
e05fd00
Implementing readReg, readBlock and writeReg
mexanick Mar 19, 2020
b5ddc08
Techincal: fixing makefiles to include CTP7 headers where needed, int…
mexanick Mar 23, 2020
ede0eb6
Removing device monitors. The parameter DisableMonitoring is still pl…
mexanick Mar 23, 2020
3b2e2f5
Dropping uhal support from hardware devices with exception of AMC13, …
mexanick Mar 23, 2020
b293658
Converting all RPC calls to templated RPC calls under gemhardware sub…
mexanick Mar 25, 2020
02665dc
Removing obsolete scan functionality
mexanick Mar 31, 2020
86b1979
Fixing remaining leftovers from uhal
mexanick Mar 31, 2020
ba93668
Added read/write exceptions logging
mexanick Mar 31, 2020
4fecfa0
Changing interface of configGBT. As this function is not yet used on …
mexanick Apr 1, 2020
c5d3a93
Adding missing change in configGBT interface
mexanick Apr 1, 2020
d0fab37
Fixing missed function implementations in hardware managers web inter…
mexanick Apr 2, 2020
17a39f7
Removing uhal dependency from gemhardware/devices Makefile, fixing in…
mexanick Apr 2, 2020
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
3 changes: 0 additions & 3 deletions gembase/src/common/GEMApplication.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ gem::base::GEMApplication::GEMApplication(xdaq::ApplicationStub *stub) :

p_appInfoSpaceToolBox = std::shared_ptr<utils::GEMInfoSpaceToolBox>(new utils::GEMInfoSpaceToolBox(this,
p_appInfoSpace,
// p_gemMonitor,
false));
CMSGEMOS_DEBUG("GEMApplication::application infospace has name: " << p_appInfoSpace->name());
CMSGEMOS_DEBUG(m_urn);
Expand All @@ -88,7 +87,6 @@ gem::base::GEMApplication::GEMApplication(xdaq::ApplicationStub *stub) :
}
p_monitorInfoSpaceToolBox = std::shared_ptr<utils::GEMInfoSpaceToolBox>(new utils::GEMInfoSpaceToolBox(this,
p_monitorInfoSpace,
// p_gemMonitor,
false));
toolbox::net::URN cfgISURN(m_urn+toolbox::toString(":config-infospace"));
if (xdata::getInfoSpaceFactory()->hasItem(cfgISURN.toString())) {
Expand All @@ -100,7 +98,6 @@ gem::base::GEMApplication::GEMApplication(xdaq::ApplicationStub *stub) :
}
p_configInfoSpaceToolBox = std::shared_ptr<utils::GEMInfoSpaceToolBox>(new utils::GEMInfoSpaceToolBox(this,
p_configInfoSpace,
// p_gemMonitor,
false));

CMSGEMOS_DEBUG("GEMApplication::GEM application has infospace named " << p_appInfoSpace->name());
Expand Down
3 changes: 2 additions & 1 deletion gemdaqmonitor/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ DependentLibraryDirs+=$(BUILD_HOME)/gemhardware/utils/lib/$(XDAQ_OS)/$(XDAQ_PLAT
DependentLibraryDirs+=$(XHAL_ROOT)/lib

DependentLibraries =gembase
DependentLibraries+=gemhwdevices gemhwutils xhal-client
#FIXME hacky linking of xhal-base
DependentLibraries+=gemhwdevices gemhwutils xhal-client xhal-base
DependentLibraries+=boost_iostreams

include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/Makefile.rules
Expand Down
13 changes: 9 additions & 4 deletions gemhardware/devices/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ ifndef PROJECT_NAME
PROJECT_NAME=cmsgemos
endif

ifndef GEM_VARIANT
GEM_VARIANT = ge11
endif

Project=$(PROJECT_NAME)
ShortProject=gem
Package=gemhardware/devices
Expand All @@ -28,12 +32,11 @@ GEMHWDEVICES_VER_PATCH=1

include $(CfgDir)/mfDefsGEM.mk

UserCFlags+=-DGEM_VARIANT="$(GEM_VARIANT)"

Sources =version.cc
# Sources =utils/GEMCrateUtils.cc
Sources+=GEMHwDevice.cc
Sources+=amc/HwGenericAMC.cc
Sources+=glib/HwGLIB.cc
#Sources+=ctp7/HwCTP7.cc
Sources+=optohybrid/HwOptoHybrid.cc

DynamicLibrary=gemhwdevices
Expand All @@ -44,6 +47,7 @@ IncludeDirs+=$(BUILD_HOME)/gemhardware/utils/include
IncludeDirs+=$(BUILD_HOME)/gemutils/include
IncludeDirs+=$(uHALROOT)/include
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise, still refs uhal

IncludeDirs+=$(XHAL_ROOT)/include
IncludeDirs+=$(CTP7_ROOT)/include

DependentLibraryDirs+=$(BUILD_HOME)/gemhardware/utils/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
DependentLibraryDirs+=$(BUILD_HOME)/gemutils/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
Expand All @@ -55,7 +59,8 @@ LibraryDirs+=$(BUILD_HOME)/gemutils/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
LibraryDirs+=$(uHALROOT)/lib
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this still needed?

LibraryDirs+=$(XHAL_ROOT)/lib

DependentLibraries =cactus_uhal_uhal xhal-client
#FIXME hacky linking of xhal-base
DependentLibraries =cactus_uhal_uhal xhal-client xhal-base
mexanick marked this conversation as resolved.
Show resolved Hide resolved
DependentLibraries+=gemutils gemhwutils

include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/Makefile.rules
Expand Down
Loading