Add DacDelay and FilterByPass in MetaData.
This commit is contained in:
@@ -39,7 +39,7 @@ MetaData MetaDataReader::getMetaDataFromKIT(const std::string& aFilePath,std::sh
|
||||
if(samplerateVar!=nullptr)
|
||||
{
|
||||
result.setSamplerate(static_cast<unsigned int>(*reinterpret_cast<double*>(samplerateVar->data)));
|
||||
}
|
||||
}
|
||||
matvar_t* metaDataVar = Mat_VarRead(matFile,"MetaData");
|
||||
if(metaDataVar !=nullptr)
|
||||
{
|
||||
@@ -49,6 +49,17 @@ MetaData MetaDataReader::getMetaDataFromKIT(const std::string& aFilePath,std::sh
|
||||
{
|
||||
result.setMeasurementID(MatlabHelper::getMatlabString(measurementIDVar));
|
||||
}
|
||||
//DACDelay
|
||||
matvar_t* dacDelayVar = Mat_VarGetStructFieldByName(metaDataVar,"DACDelay",0);
|
||||
if(dacDelayVar!=nullptr)
|
||||
{
|
||||
result.setDacDelay(*reinterpret_cast<double*>(dacDelayVar->data));
|
||||
}
|
||||
matvar_t* filterByPassVar = Mat_VarGetStructFieldByName(metaDataVar,"FilterBypass",0);
|
||||
if(filterByPassVar!=nullptr)
|
||||
{
|
||||
result.setFilterByPass(*reinterpret_cast<double*>(filterByPassVar->data));
|
||||
}
|
||||
//AperturePosition
|
||||
result.setAperturePositionNumber(aShotList->getMotorPositionSize());
|
||||
}
|
||||
@@ -127,6 +138,14 @@ MetaData MetaDataReader::getMetaDataFromHJ(const std::string& aConfigBinPath, co
|
||||
{
|
||||
result.setSampleNumber(amcBoardConfig.at("Shot length").get<unsigned int>());
|
||||
}
|
||||
if(amcBoardConfig.contains("DAC Delay"))
|
||||
{
|
||||
result.setDacDelay(amcBoardConfig.at("DAC Delay").get<double>());
|
||||
}
|
||||
if(amcBoardConfig.contains("Filter"))
|
||||
{
|
||||
result.setFilterByPass(amcBoardConfig.at("Filter").get<double>());
|
||||
}
|
||||
}
|
||||
|
||||
std::ifstream stream;
|
||||
|
||||
Reference in New Issue
Block a user