1
0
Fork 0
mirror of https://github.com/gwm17/Specter.git synced 2024-11-23 02:38:52 -05:00

Actually implemented cathode

This commit is contained in:
Gordon McCann 2022-05-11 22:34:59 -04:00
parent 5b39589c17
commit 40eb727b7d
2 changed files with 9 additions and 1 deletions

View File

@ -11,7 +11,7 @@ namespace Navigator {
//Construct each NavParameter with their unique name. Then bind them to the SpectrumManager. //Construct each NavParameter with their unique name. Then bind them to the SpectrumManager.
SPSAnalysisStage::SPSAnalysisStage() : SPSAnalysisStage::SPSAnalysisStage() :
AnalysisStage("SPSAnalysis"), delayFLTime("delayFLTime"), delayFRTime("delayFRTime"), delayBLTime("delayBLTime"), delayBRTime("delayBRTime"), x1("x1"), x2("x2"), xavg("xavg"), AnalysisStage("SPSAnalysis"), delayFLTime("delayFLTime"), delayFRTime("delayFRTime"), delayBLTime("delayBLTime"), delayBRTime("delayBRTime"), x1("x1"), x2("x2"), xavg("xavg"),
scintLeft("scintLeft"), anodeBack("anodeBack"), cathode("cathode"), xavg_sabreCoinc("xavg_sabreCoinc"), x1_weight("x1_weight"), x2_weight("x2_weight") scintLeft("scintLeft"), anodeBack("anodeBack"), anodeFront("anodeFront"), cathode("cathode"), xavg_sabreCoinc("xavg_sabreCoinc"), x1_weight("x1_weight"), x2_weight("x2_weight")
{ {
NAV_PROFILE_FUNCTION(); NAV_PROFILE_FUNCTION();
SpectrumManager& manager = SpectrumManager::GetInstance(); SpectrumManager& manager = SpectrumManager::GetInstance();
@ -25,6 +25,7 @@ namespace Navigator {
manager.BindParameter(xavg, 600, -300.0, 300.0); manager.BindParameter(xavg, 600, -300.0, 300.0);
manager.BindParameter(scintLeft, 4096, 0.0, 4096.0); manager.BindParameter(scintLeft, 4096, 0.0, 4096.0);
manager.BindParameter(anodeBack, 4096, 0.0, 4096.0); manager.BindParameter(anodeBack, 4096, 0.0, 4096.0);
manager.BindParameter(anodeFront, 4096, 0.0, 4096.0);
manager.BindParameter(cathode, 4096, 0.0, 4096); manager.BindParameter(cathode, 4096, 0.0, 4096);
manager.BindParameter(xavg_sabreCoinc, 600, -300.0, 300.0); manager.BindParameter(xavg_sabreCoinc, 600, -300.0, 300.0);
@ -67,6 +68,9 @@ namespace Navigator {
case 129: case 129:
scintLeft.SetValue(hit.longEnergy); scintLeft.SetValue(hit.longEnergy);
break; break;
case 135:
cathode.SetValue(hit.longEnergy);
break;
case 136: case 136:
delayFLTime.SetValue(hit.timestamp / 1.0e3); delayFLTime.SetValue(hit.timestamp / 1.0e3);
break; break;
@ -79,6 +83,9 @@ namespace Navigator {
case 139: case 139:
delayBRTime.SetValue(hit.timestamp / 1.0e3); delayBRTime.SetValue(hit.timestamp / 1.0e3);
break; break;
case 141:
anodeFront.SetValue(hit.longEnergy);
break;
case 143: case 143:
anodeBack.SetValue(hit.longEnergy); anodeBack.SetValue(hit.longEnergy);
break; break;

View File

@ -27,6 +27,7 @@ namespace Navigator {
NavParameter xavg; NavParameter xavg;
NavParameter scintLeft; NavParameter scintLeft;
NavParameter anodeBack; NavParameter anodeBack;
NavParameter anodeFront;
NavParameter cathode; NavParameter cathode;
NavParameter xavg_sabreCoinc; NavParameter xavg_sabreCoinc;