added ch2ns, remove Pixie16Msg.log at begin of test.cpp
This commit is contained in:
parent
2f640d6e51
commit
9e16a53075
|
@ -62,7 +62,7 @@ Pixie16::~Pixie16(){
|
|||
CheckError("Pixie16ExitSystem");
|
||||
|
||||
delete PXISlotMap;
|
||||
|
||||
delete ch2ns;
|
||||
delete ComFPGAConfigFile;
|
||||
delete SPFPGAConfigFile;
|
||||
delete TrigFPGAConfigFile;
|
||||
|
@ -85,6 +85,8 @@ bool Pixie16::LoadConfigFile(std::string fileName){
|
|||
OfflineMode = 0;
|
||||
PXISlotMap = new unsigned short[NumModules];
|
||||
|
||||
ch2ns = new unsigned short[NumModules];
|
||||
|
||||
ComFPGAConfigFile = new char* [NumModules];
|
||||
SPFPGAConfigFile = new char* [NumModules];
|
||||
TrigFPGAConfigFile = new char* [NumModules];
|
||||
|
@ -185,6 +187,8 @@ void Pixie16::GetDigitizerInfo(unsigned short modID){
|
|||
printf(" ADC Bits : %d \n", ModADCBits);
|
||||
printf("ADC sampling rate : %d \n", ModADCMSPS);
|
||||
|
||||
ch2ns[modID] = 1000/ModADCMSPS;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -48,6 +48,8 @@ private:
|
|||
unsigned short NumModules;
|
||||
unsigned short * PXISlotMap;
|
||||
unsigned short OfflineMode;
|
||||
|
||||
unsigned short * ch2ns;
|
||||
|
||||
char ** ComFPGAConfigFile;
|
||||
char ** SPFPGAConfigFile;
|
||||
|
@ -92,6 +94,8 @@ public:
|
|||
|
||||
void GetDigitizerInfo(unsigned short modID);
|
||||
void BootDigitizers();
|
||||
|
||||
unsigned short GetCh2ns(unsigned short modID) {return ch2ns[modID];}
|
||||
|
||||
void AdjustOffset();
|
||||
void CaptureBaseLine(unsigned short modID, unsigned short ch);
|
||||
|
|
Loading…
Reference in New Issue
Block a user