Commit b21f219b authored by Sarah Seif El Nasr's avatar Sarah Seif El Nasr
Browse files

First commit

parent 025bd1a6
......@@ -1475,7 +1475,7 @@ void D19cFWInterface::InitFMCPower()
for (auto cHybrid : *cModule)
{
this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.hybrid_select" , cHybrid->getId()) ;
//this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.hybrid_select" , cHybrid->getId()) ;
this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.chip_select" , 0) ;
//uint8_t cBitslip=0;
......@@ -1723,7 +1723,7 @@ void D19cFWInterface::InitFMCPower()
if( cCic == NULL )
continue;
this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.hybrid_select" , cHybrid->getId()) ;
//this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.hybrid_select" , cHybrid->getId()) ;
this->WriteReg( "fc7_daq_cnfg.physical_interface_block.slvs_debug.chip_select" , 0) ;
if( pScope)
this->StubDebug ();
......
file(GLOB_RECURSE PH2_HYBRIDS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../Hybrid_Control/USB_a.h)
if(PH2_HYBRIDS_SOURCE_DIR)
set(PH2_HYBRIDS_FOUND TRUE)
#strip to the blank path
get_filename_component(PH2_HYBRIDS_SOURCE_DIR "${PH2_HYBRIDS_SOURCE_DIR}" PATH)
find_library(PH2_HYBRIDS_LIBRARY_DIRS
NAMES
lib/libUSB_a.so
PATHS
${PH2_HYBRIDS_SOURCE_DIR}
)
#strip away the path
get_filename_component(PH2_HYBRIDS_LIBRARY_DIRS "${PH2_HYBRIDS_LIBRARY_DIRS}" PATH)
#strip again to get the path to the Ph2_USBInstDriver directory from the root of the FS
get_filename_component(PH2_HYBRIDS_SOURCE_DIR "${PH2_HYBRIDS_SOURCE_DIR}" PATH)
set(PH2_HYBRIDS_INCLUDE_DIRS
${PH2_HYBRIDS_SOURCE_DIR})
file(GLOB_RECURSE PH2_HYBRIDS_LIBRARY_DIRS ${PH2_HYBRIDS_LIBRARY_DIRS}/*.so)
else(PH2_HYBRIDS_SOURCE_DIR)
set(PH2_HYBRIDS_FOUND FALSE)
endif(PH2_HYBRIDS_SOURCE_DIR)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PH2_Antenna DEFAULT_MSG PH2_HYBRIDS_SOURCE_DIR)
# show the PH2_USBINSTLIB_INCLUDE_DIRS and PH2_USBINSTLIB_LIBRARIES variables only in the advanced view
mark_as_advanced(PH2_HYBRIDS_INCLUDE_DIRS PH2_HYBRIDS_LIBRARY_DIRS)
......@@ -4,15 +4,15 @@
<!-- <connection id="board" uri="chtcp-2.0://pchpdaq01.cern.ch:10203?target=192.168.0.19:50001" address_table="file://settings/address_tables/uDTC_OT_address_table.xml" /> -->
<!-- <connection id="board" uri="chtcp-2.0://hybridtesting.cern.ch:10203?target=192.168.0.11:50001" address_table="file://settings/address_tables/d19c_address_table_legacy.xml" /> -->
<!-- <connection id="board" uri="chtcp-2.0://cmsuptkhsetup2:10203?target=192.168.0.9:50001" address_table="file://settings/address_tables/uDTC_OT_address_table.xml" /> -->
<!-- <connection id="board" uri="chtcp-2.0://hybridtesting:10203?target=192.168.0.9:50001" address_table="file://settings/address_tables/uDTC_OT_address_table_test.xml" /> -->
<connection id="board" uri="chtcp-2.0://cmsuptracker003.cern.ch:10203?target=192.168.0.9:50001" address_table="file://settings/address_tables/uDTC_OT_address_table_test.xml" />
<connection id="board" uri="chtcp-2.0://hybridtesting:10203?target=192.168.0.9:50001" address_table="file://settings/address_tables/uDTC_OT_address_table.xml" />
<!-- <connection id="board" uri="chtcp-2.0://cmsuptracker003.cern.ch:10203?target=192.168.0.9:50001" address_table="file://settings/address_tables/uDTC_OT_address_table_test.xml" /> -->
<!-- <connection id="board" uri="chtcp-2.0://jadsdesktop.cern.ch:10203?target=192.168.2.100:50001" address_table="file://settings/address_tables/d19c_address_table_legacy.xml" /> -->
<CDCE configure="1" clockRate="120"/>
<CDCE configure="0" clockRate="120"/>
<OpticalGroup Id="0" FMCId="0" >
<GBT phaseTap="7" enable="1"/>
<!-- <Module FeId="0" FMCId="0" ModuleId="0" Status="1" LinkId="0">
<GBT phaseTap="7" enable="0"/>
<Module FeId="0" FMCId="0" ModuleId="0" Status="1" LinkId="0">
<Global>
<Settings threshold="550" latency="19"/>
<TestPulse enable="0" polarity="0" amplitude="0xFF" channelgroup="0" delay="0" groundothers="1"/>
......@@ -34,10 +34,10 @@
<CIC_Files path="./settings/CicFiles/" />
<CIC Id="8" configfile="CIC_default.txt" />
</Module> -->
</Module>
<!-- LHS -->
<Module FeId="1" FMCId="0" ModuleId="0" Status="1" LinkId="0">
<!-- <Module FeId="1" FMCId="0" ModuleId="0" Status="1" LinkId="0">
<Global>
<Settings threshold="550" latency="19"/>
<TestPulse enable="0" polarity="0" amplitude="0xFF" channelgroup="0" delay="0" groundothers="1"/>
......@@ -59,7 +59,7 @@
<CIC_Files path="./settings/CicFiles/" />
<CIC Id="8" configfile="CIC_default.txt" />
</Module>
</Module> -->
</OpticalGroup>
<SLink>
......@@ -84,7 +84,7 @@
<!-- Fast Command Block -->
<Register name="fast_command_block">
<Register name="triggers_to_accept"> 0 </Register>
<Register name="trigger_source"> 3 </Register>
<Register name="trigger_source"> 6 </Register>
<Register name="user_trigger_frequency"> 10 </Register>
<Register name="stubs_mask"> 0 </Register>
<!--this is the delay for the stub trigger-->
......
......@@ -270,10 +270,13 @@ void DataChecker::matchEvents(BeBoard* pBoard, std::vector<uint8_t>pChipIds , st
for(auto cOpticalGroup : *pBoard)
{
auto& cThisModuleHitCheck = cThisHitCheckContainer->at(cOpticalGroup->getIndex());
auto& cThisModuleStubCheck = cThisStubCheckContainer->at(cOpticalGroup->getIndex());
for (auto cHybrid : *cOpticalGroup)
{
auto& cHybridHitCheck = cThisHitCheckContainer->at(cHybrid->getIndex());
auto& cHybridStubCheck = cThisStubCheckContainer->at(cHybrid->getIndex());
auto& cHybridHitCheck = cThisModuleHitCheck->at(cHybrid->getIndex());
auto& cHybridStubCheck = cThisModuleStubCheck->at(cHybrid->getIndex());
auto cHybridId = cHybrid->getId();
......@@ -354,7 +357,7 @@ void DataChecker::matchEvents(BeBoard* pBoard, std::vector<uint8_t>pChipIds , st
int cNmatchedStubs=0;
for( auto cStub : cStubs )
{
LOG (DEBUG) << BOLDMAGENTA << "\t... stub seed " << +cStub.getPosition() << " --- bend code of " << +cStub.getBend() << " expect seed " << +cSeed << " and bend code " << +cBendCode << RESET;
LOG (INFO) << BOLDMAGENTA << "\t... stub seed " << +cStub.getPosition() << " --- bend code of " << +cStub.getBend() << " expect seed " << +cSeed << " and bend code " << +cBendCode << RESET;
bool cMatchFound = (cStub.getPosition() == cSeed && cStub.getBend() == cBendCode);
auto& cOcc = cReadoutChipStubCheck->getSummary<int>();
cOcc += static_cast<int>(cMatchFound);
......
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