rtang/SOLARIS_QT6_DAQ
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

remove some private non-use member

Browse Source
This commit is contained in:
Ryan Tang 2023-02-28 17:49:33 -05:00
parent ec7d8ff740
commit 684f603bf7
2 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ClassDigitizer2Gen.cpp
View File

@ -21,20 +21,10 @@ void Digitizer2Gen::Initialization(){
isConnected = false; isConnected = false;
isDummy = false; isDummy = false;
modelName = "";
cupVersion = "";
DPPVersion = "";
DPPType = "";
serialNumber = 0; serialNumber = 0;
adcBits = 0;
nChannels = 0; nChannels = 0;
adcRate = 0;
ch2ns = 0; ch2ns = 0;
IPAddress = "";
netMask = "";
gateway = "";
outFileIndex = 0; outFileIndex = 0;
FinishedOutFilesSize = 0; FinishedOutFilesSize = 0;
dataStartIndetifier = 0xAAA0; dataStartIndetifier = 0xAAA0;
@ -203,41 +193,29 @@ int Digitizer2Gen::OpenDigitizer(const char * url){
isConnected = true; isConnected = true;
modelName = ReadValue("/par/ModelName"); ReadAllSettings();
cupVersion = ReadValue("/par/cupver");
DPPVersion = ReadValue("/par/FPGA_FwVer");
DPPType = ReadValue("/par/FwType");
serialNumber = atoi(ReadValue("/par/SerialNum").c_str()); serialNumber = atoi(ReadValue("/par/SerialNum").c_str());
nChannels = atoi(ReadValue("/par/NumCh").c_str()); nChannels = atoi(ReadValue("/par/NumCh").c_str());
adcBits = atoi(ReadValue("/par/ADC_Nbit").c_str()); int adcRate = atoi(GetSettingValue(DIGIPARA::DIG::ADC_SampleRate).c_str());
adcRate = atoi(ReadValue("/par/ADC_SamplRate").c_str());
ch2ns = 1000/adcRate; ch2ns = 1000/adcRate;
IPAddress = ReadValue("/par/IPAddress"); printf(" IP address : %s\n", GetSettingValue(DIGIPARA::DIG::IPAddress).c_str());
netMask = ReadValue("/par/Netmask"); printf(" Net Mask : %s\n", GetSettingValue(DIGIPARA::DIG::NetMask).c_str());
gateway = ReadValue("/par/Gateway"); printf(" Gateway : %s\n", GetSettingValue(DIGIPARA::DIG::Gateway).c_str());
printf(" IP address : %s\n", IPAddress.c_str()); printf(" Model name : %s\n", GetSettingValue(DIGIPARA::DIG::ModelName).c_str());
printf(" Net Mask : %s\n", netMask.c_str()); printf(" CUP version : %s\n", GetSettingValue(DIGIPARA::DIG::CupVer).c_str());
printf(" Gateway : %s\n", gateway.c_str()); printf(" DPP Type : %s\n", GetSettingValue(DIGIPARA::DIG::FirmwareType).c_str());
printf(" DPP Version : %s\n", GetSettingValue(DIGIPARA::DIG::FPGA_firmwareVersion).c_str());
printf(" Model name : %s\n", modelName.c_str());
printf(" CUP version : %s\n", cupVersion.c_str());
printf(" DPP Type : %s\n", DPPType.c_str());
printf(" DPP Version : %s\n", DPPVersion.c_str());
printf("Serial number : %d\n", serialNumber); printf("Serial number : %d\n", serialNumber);
printf(" ADC bits : %d\n", adcBits); printf(" ADC bits : %s\n", GetSettingValue(DIGIPARA::DIG::ADC_bit).c_str());
printf(" ADC rate : %d Msps, ch2ns : %d ns\n", adcRate, ch2ns); printf(" ADC rate : %d Msps, ch2ns : %d ns\n", adcRate, ch2ns);
printf(" Channels : %d\n", nChannels); printf(" Channels : %d\n", nChannels);
//------ set default setting file name //------ set default setting file name
settingFileName = "settings_"+ std::to_string(serialNumber) + ".dat"; settingFileName = "settings_"+ std::to_string(serialNumber) + ".dat";
//ReadValue("/par/InputRange", true);
//ReadValue("/par/InputType", true);
//ReadValue("/par/Zin", true);
printf("====================== \n"); printf("====================== \n");
return 0; return 0;

10
ClassDigitizer2Gen.h
View File

@ -31,20 +31,10 @@ class Digitizer2Gen {
char retValue[256]; char retValue[256];
std::string modelName;
std::string cupVersion;
std::string DPPVersion;
std::string DPPType;
unsigned short serialNumber; unsigned short serialNumber;
unsigned short adcBits;
unsigned short nChannels; unsigned short nChannels;
unsigned short adcRate;
unsigned short ch2ns; unsigned short ch2ns;
std::string IPAddress;
std::string netMask;
std::string gateway;
void Initialization(); void Initialization();
uint64_t realTime[MaxNumberOfChannel]; uint64_t realTime[MaxNumberOfChannel];