diff --git a/NPAnalysis/SPcoincW1/RunToTreat.txt b/NPAnalysis/SPcoincW1/RunToTreat.txt index 75b09f79ea6ded2c0838de875fa960a483b90c35..c97527d5849c132ef17134c19493dc77556ac411 100644 --- a/NPAnalysis/SPcoincW1/RunToTreat.txt +++ b/NPAnalysis/SPcoincW1/RunToTreat.txt @@ -7,6 +7,10 @@ RootFileName % /scratch/gypaos/data/al27pp/oct2015/midas/root/R50_0.root % /scratch/gypaos/data/al27pp/oct2015/midas/root/R131_0_test.root % /scratch/gypaos/data/al27pp/oct2015/midas/root/R108_0_test.root - /scratch/gypaos/data/al27pp/oct2015/midas/root/R74_0.root +% /scratch/gypaos/data/al27pp/oct2015/midas/root/R74_0.root % /scratch/gypaos/data/al27pp/oct2015/midas/root/R72_0.root + /scratch/gypaos/data/al27pp/oct2015/midas/root/R113_0.root + /scratch/gypaos/data/al27pp/oct2015/midas/root/R114_0.root + /scratch/gypaos/data/al27pp/oct2015/midas/root/R115_0.root + /scratch/gypaos/data/al27pp/oct2015/midas/root/R116_0.root diff --git a/NPAnalysis/SPcoincW1/calibs/SplitPoleCalibration.txt b/NPAnalysis/SPcoincW1/calibs/SplitPoleCalibration.txt index 1b07fa6b5f1d7f0d9e9bfe2f941d2e462dafa0ff..613ee96369047bd97d6f8de67a911b7e8a387081 100644 --- a/NPAnalysis/SPcoincW1/calibs/SplitPoleCalibration.txt +++ b/NPAnalysis/SPcoincW1/calibs/SplitPoleCalibration.txt @@ -1 +1 @@ -POSITION 6.21221e-01 1.73257e-05 +POSITION 6.21491e-01 4.21269e-05 diff --git a/NPLib/SplitPole/TSplitPolePhysics.cxx b/NPLib/SplitPole/TSplitPolePhysics.cxx index 4b7f6443476b3af1264d655d766e0206463dce1a..30f542bc7cbab82f31da314660ae907fe6cf318b 100644 --- a/NPLib/SplitPole/TSplitPolePhysics.cxx +++ b/NPLib/SplitPole/TSplitPolePhysics.cxx @@ -58,14 +58,14 @@ TSplitPolePhysics::TSplitPolePhysics() m_RunStart(2015, 10, 6, 0, 0, 0), m_RunStop(2015, 10, 7, 0, 0, 0), m_RunLength(0), - m_FrequenceClock(2.03), + m_FrequenceClock(2.0516), m_TickMin(0), m_TickMax(0), m_RunNumber(0), m_CurrentRunNumber(0), m_CurrentNMR(new TSplitPoleNMR), m_MagneticFieldCorrection(0), - m_TimeDelay(6500), + m_TimeDelay(3657), m_LargeField(0), m_NmrFilePath("./") { @@ -330,15 +330,26 @@ void TSplitPolePhysics::BuildSimplePhysicalEvent() } // Correct for magnetic field variation fAbsoluteTick = m_RunStart.AsDouble() + m_PreTreatedData->GetTick()/m_FrequenceClock; - if (m_MagneticFieldCorrection) { - fBrho = m_PreTreatedData->GetPlasticG() * m_CurrentNMR->EvalB(fAbsoluteTick); + // check if NMR pointer exist + if (m_CurrentNMR) { + // check if magnetic field correction needed + if (m_MagneticFieldCorrection) { + fBrho = m_PreTreatedData->GetPlasticG() * m_CurrentNMR->EvalB(fAbsoluteTick); + } + else { + if (!isSameRun) { + cout << "\t\033[1;31mSplitPole Warning!!! run " << m_CurrentRunNumber << " will use mean magnetic field value " + << m_CurrentNMR->GetMean() << " T.m.\033[0m" << endl; + } + fBrho = m_PreTreatedData->GetPlasticG() * m_CurrentNMR->GetMean(); + } } else { + fBrho = -1; if (!isSameRun) { - cout << "\tSplitPole Warning!!! run " << m_CurrentRunNumber << " will use mean magnetic field value " - << m_CurrentNMR->GetMean() << " T.m." << endl; + cout << "\t\033[1;31mSplitPole Warning!!! run " << m_CurrentRunNumber << " no associated magnetic field...\033[0m" << endl; + } - fBrho = m_PreTreatedData->GetPlasticG() * m_CurrentNMR->GetMean(); } } @@ -374,7 +385,7 @@ void TSplitPolePhysics::ReadAnalysisConfig() { bool ReadingStatus = false; - cout << "\t/////////// Reading ConfigSplitPole.dat file ///////////" << endl; + cout << "\t\033[1;35m/////////// Reading ConfigSplitPole.dat file ///////////" << endl; // path to file string FileName = "./configs/ConfigSplitPole.dat";