Commit b0bda493 authored by Georg Auzinger's avatar Georg Auzinger
Browse files

some small fixes

parent 16e25423
......@@ -171,10 +171,10 @@ namespace Ph2_HwInterface {
if (cSuccess)
pCbc->setReg ( pRegNode, pValue );
#ifdef COUNT_FLAG
fRegisterCount++;
fTransactionCount++;
#endif
#ifdef COUNT_FLAG
fRegisterCount++;
fTransactionCount++;
#endif
return cSuccess;
}
......
......@@ -25,9 +25,9 @@ endif
ifneq ("$(wildcard $(USBINSTDIR))","")
DEPENDENCIES := ../Ph2_USBInstDriver $(DEPENDENCIES)
USBINSTINSTALLED = yes
USBINSTINSTRUCTIONS = HMP4040 instrument driver found.
USBINSTINSTRUCTIONS =
else
USBINSTINSTRUCTIONS = To use the HMP4040 Instrument driver, please download the Driver from 'https://gitlab.cern.ch/cms_tk_ph2/Ph2_USBInstDriver.git'.
USBINSTINSTRUCTIONS = To use the Ph2_USBInstDriver please download it from 'https://gitlab.cern.ch/cms_tk_ph2/Ph2_USBInstDriver.git'.
endif
.PHONY: print dependencies $(DEPENDENCIES) clean src miniDAQ tools
......@@ -80,4 +80,4 @@ clean:
(cd Tracker; make clean)
(cd AMC13; make clean)
#(cd doc; make clean)
(rm -f lib/* bin/*)
\ No newline at end of file
(rm -f lib/* bin/*)
......@@ -138,7 +138,6 @@ namespace Ph2_System {
/*!
* \brief Initialize the settings
* \Added to allow the reconfiguation of the settings during a test procedure.
* \param pFilename : settings file
*\param os : ostream to dump output
*/
......
......@@ -6,8 +6,8 @@
<FW_Version NCbcDataSize="4" />
<Module FeId="0" FMCId="0" ModuleId="0" Status="1">
<Global_CBC_Register name="MiscTestPulseCtrl&amp;AnalogMux">0x21</Global_CBC_Register>
<CBC Id="0" configfile="./settings/Cbc_default_hole.txt" />
<CBC Id="1" configfile="./settings/Cbc_default_hole.txt" />
<CBC Id="0" configfile="./settings/Cbc_default_electron.txt" />
<CBC Id="1" configfile="./settings/Cbc_default_electron.txt" />
</Module>
<!-- Commissioning Mode -->
<!-- set to 1 to enable commissioning mode -->
......@@ -52,6 +52,6 @@
<Setting name="TargetOffset">0x50</Setting>
<Setting name="Nevents">100</Setting>
<Setting name="TestPulsePotentiometer">0x00</Setting>
<Setting name="HoleMode">1</Setting>
<Setting name="HoleMode">0</Setting>
<Setting name="VerificationLoop">1</Setting>
</Settings>
......@@ -15,13 +15,10 @@
<!--<Global_CBC_Register name="SelTestPulseDel&ChanGroup">0x00</Global_CBC_Register>-->
<CBC_Files path="./settings/" />
<!-- <CBC Id="0" configfile="Cbc_default_hole.txt" />
<CBC Id="1" configfile="Cbc_default_hole.txt" /> -->
<CBC_Files path="./Results/IntegratedTester_Hole_26-10-16_18:00/" />
<CBC Id="0" configfile="FE0CBC0.txt" />
<CBC Id="1" configfile="FE0CBC1.txt" />
<CBC Id="0" configfile="Cbc_default_electron.txt" />
<CBC Id="1" configfile="Cbc_default_electron.txt" />
</Module>
<!-- Commissioning Mode -->
<!-- set to 1 to enable commissioning mode -->
<Register name="COMMISSIONNING_MODE_RQ">0</Register>
......
......@@ -8,14 +8,12 @@
<FW_Version NCbcDataSize="4"/>
<Module FeId="0" FMCId="0" ModuleId="0" Status="1">
<Global_CBC_Register name="VCth"> 0x78 </Global_CBC_Register>
<!--Global_CBC_Register name="TriggerLatency"> 0x0C </Global_CBC_Register-->
<CBC_Files path="./Results/IntegratedTester_Hole_26-10-16_18:00/" />
<CBC Id="0" configfile="FE0CBC0.txt"/>
<CBC Id="1" configfile="FE0CBC1.txt"/>
<CBC_Files path="/settings/" />
<CBC Id="0" configfile="Cbc_default_electron.txt"/>
<CBC Id="1" configfile="Cbc_default_electron.txt"/>
</Module>
<!-- Commissioning Mode -->
......@@ -61,6 +59,6 @@
<Settings>
<Setting name="Nevents"> 100 </Setting>
<Setting name="HoleMode"> 1 </Setting>
<Setting name="HoleMode"> 0 </Setting>
<Setting name="Threshold_NSigmas"> 4 </Setting>
</Settings>
......@@ -22,4 +22,4 @@ export USBINSTLIB=../Ph2_USBInstDriver/lib
export PATH=$BASE_DIR/bin:$PATH
export LD_LIBRARY_PATH=$BASE_DIR/$HMP4040LIB:$BASE_DIR/$ANTENNALIB:$BASE_DIR/RootWeb/lib:/opt/cactus/lib:$BASE_DIR/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=$BASE_DIR/$USBINSTLIB:$BASE_DIR/$ANTENNALIB:$BASE_DIR/RootWeb/lib:/opt/cactus/lib:$BASE_DIR/lib:${LD_LIBRARY_PATH}
ANTENNADIR=../CMSPh2_AntennaDriver
AntennaFlag = -D__ANTENNA__
AMC13DIR=/opt/cactus/include/amc13
Amc13Flag = -D__AMC13__
USBINSTDIR=../../Ph2_USBInstDriver
USBINSTFlag = -D__USBINST__
ZMQ_HEADER_PATH = /usr/include/zmq.hpp
CC = gcc
CXX = g++
CCFlags = -g -O0 -w -Wall -pedantic -pthread -std=c++0x -fPIC
......@@ -8,14 +16,6 @@ ZmqFlag = -D__ZMQ__
DevFlags =
ANTENNADIR=../CMSPh2_AntennaDriver
AntennaFlag = -D__ANTENNA__
AMC13DIR=/opt/cactus/include/amc13
Amc13Flag = -D__AMC13__
USBINSTDIR=../../Ph2_USBInstDriver
USBINSTFlag = -D__USBINST__
ZMQ_HEADER_PATH = /usr/include/zmq.hpp
LibraryDirs = /opt/cactus/lib ../lib
IncludeDirs = /opt/cactus/include ../
ExternalObjects= $(LibraryPaths) -lcactus_extern_pugixml -lcactus_uhal_log -lcactus_uhal_grammars -lcactus_uhal_uhal -lboost_system -lPh2_Interface -lPh2_Description -lPh2_System -lPh2_Utils -lPh2_Tracker -lPh2_Tools
......@@ -35,7 +35,8 @@ endif
ifneq ("$(wildcard $(ANTENNADIR))","")
IncludeDirs += $(ANTENNADIR)
LibraryDirs += $(ANTENNADIR)/lib /usr/lib64/
ExternalObjects += -lboost_thread -lPh2_Antenna $(AntennaFlag)
#ExternalObjects += -lboost_thread -lPh2_Antenna $(AntennaFlag)
ExternalObjects += -lPh2_Antenna $(AntennaFlag)
ANTENNAINSTALLED = yes
else
ANTENNAINSTALLED = no
......@@ -61,16 +62,17 @@ else
ZMQINSTALLED = no
ZMQINSTRUCTIONS = ZeroMQ library is required to build the lvSupervisor with the server option - get it with \'sudo yum install zeromq-devel\'
endif
##################################################
## check if the HMP4040 drivers are installed
## check if the Ph2_USBInstDriver drivers are installed
##################################################
ifneq ("$(wildcard $(USBINSTDIR))","")
LibraryDirs += $(USBINSTDIR)/lib $(USBINSTDIR)/Utils $(USBINSTDIR)/HMP4040
IncludeDirs += $(BOOST_INCLUDE) $(USBINSTDIR)/HMP4040 $(USBINSTDIR)/Utils $(USBINSTDIR)/Drivers
ExternalObjects += -lpthread -lboost_thread -lPh2_HMP4040 -lPh2_USBUtils -lPh2_Drivers $(USBINSTFlag)
HMP4040INSTALLED = yes
USBINSTLIBINSTALLED = yes
else
HMP4040INSTALLED = no
USBINSTLIBINSTALLED = no
endif
IncludePaths = $(IncludeDirs:%=-I%)
......@@ -97,7 +99,7 @@ print:
@echo 'Root Has Http:' $(ROOTVERSION)
@echo 'Amc13 SW installed:' $(AMC13INSTALLED)
@echo 'Antenna installed:' $(ANTENNAINSTALLED)
@echo 'HMP4040 installed:' $(HMP4040INSTALLED)
@echo 'Ph2_USBInstDriver installed:' $(USBINSTLIBINSTALLED)
@echo 'ZXMQ installed:' $(ZMQINSTALLED)
@echo '****************************'
......
......@@ -567,16 +567,12 @@ void Calibration::setRegValues()
void Calibration::writeGraphs()
{
fResultFile->cd();
// n
// Save hist maps for CBCs
//
//Tool::SaveResults();
// save canvases too
//fVplusCanvas->Write ( fVplusCanvas->GetName(), TObject::kOverwrite );
fOffsetCanvas->Write ( fOffsetCanvas->GetName(), TObject::kOverwrite );
fOccupancyCanvas->Write ( fOccupancyCanvas->GetName(), TObject::kOverwrite );
}
Supports Markdown
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