fixed attenuation

YanzhaoW · Jan 13, 2025 · b333f51 · b333f51
1 parent b1f9971
commit b333f51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/neuland/calibration/cal_to_hit/R3BNeulandCalToHitPar.cxx b/neuland/calibration/cal_to_hit/R3BNeulandCalToHitPar.cxx
@@ -23,7 +23,7 @@ namespace
     auto calculate_threshold(const R3B::Neuland::HitModulePar& modulePar, R3B::Side side)
     {
         const auto value = modulePar.PMTThreshold.get(side).value *
-                           std::exp(R3B::Neuland::TotalBarLength / modulePar.lightAttenuationLength.value);//Paula: i think it should be length * attenuation, based on defenitions inside of neulandPaddle
+                           std::exp(R3B::Neuland::TotalBarLength / modulePar.lightAttenuationLength.value);
         const auto err = 0.;
         return R3B::ValueError<double>{ value, err };
     }

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandLSQREngineAdaptor.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandLSQREngineAdaptor.cxx
@@ -35,7 +35,7 @@ namespace
             new_par.effectiveSpeed.value = par.GetEffectiveSpeed();
             new_par.lightAttenuationLength.value = par.GetLightAttenuationLength();
             new_par.lightAttenuationFactor.value =
-                std::exp(R3B::Neuland::TotalBarLength * new_par.lightAttenuationLength.value / 2);
+                std::exp(R3B::Neuland::TotalBarLength / new_par.lightAttenuationLength.value / 2);
 
             // Getters accept 1 as the left side and 2 as the right side
 

diff --git a/neuland/digitizing/R3BDigitizingPaddleNeuland.cxx b/neuland/digitizing/R3BDigitizingPaddleNeuland.cxx
@@ -25,19 +25,17 @@ namespace R3B::Digitizing::Neuland
     NeulandPaddle::NeulandPaddle(uint16_t paddleID)
         : Digitizing::Paddle(paddleID, SignalCouplingNeuland)
     {
-        LOG(debug) << "NeulandPaddle: Using constructor 1" << std::endl;
     }
 
     NeulandPaddle::NeulandPaddle(uint16_t paddleID, R3B::Neuland::Cal2HitPar* cal_to_hit_par)
         : Digitizing::Paddle(paddleID, SignalCouplingNeuland)
     {
-        LOG(debug) << "NeulandPaddle: Using constructor 2" << std::endl;
         const auto& module_par = cal_to_hit_par->GetModulePars().at(paddleID);
         effective_speed_ = module_par.effectiveSpeed.value;
-        gAttenuation_ = module_par.lightAttenuationLength.value;
+        attenuation_ = 1./ module_par.lightAttenuationLength.value;
         time_offset_ = module_par.tDiff.value;
         time_sync_ = module_par.tSync.value;
-        ReverseAttenFac_ = std::exp(NeulandPaddle::gHalfLength * gAttenuation_);
+        ReverseAttenFac_ = std::exp(NeulandPaddle::gHalfLength * attenuation_);
     }
 
     auto NeulandPaddle::MatchSignals(const Channel::Signal& firstSignal,
@@ -53,13 +51,13 @@ namespace R3B::Digitizing::Neuland
         if (firstT > secondT)
         {
             res = std::abs((firstE / secondE) *
-                               FastExp<4>(static_cast<Float_t>(gAttenuation_ * effective_speed_ * (firstT - secondT))) -
+                               FastExp<4>(static_cast<Float_t>(attenuation_ * effective_speed_ * (firstT - secondT))) -
                            1);
         }
         else
         {
             res =
-                std::abs((secondE / firstE) * FastExp<4>(static_cast<Float_t>(gAttenuation_ * effective_speed_ *
+                std::abs((secondE / firstE) * FastExp<4>(static_cast<Float_t>(attenuation_ * effective_speed_ *
                                                                               static_cast<Float_t>(secondT - firstT))) -
                          1);
         }
@@ -108,7 +106,7 @@ namespace R3B::Digitizing::Neuland
                                            const double dist,
                                            enum ChannelSide channel_side) const -> Channel::Hit
     {
-        auto light = double{ mcLight * std::exp(-NeulandPaddle::gAttenuation_ * (NeulandPaddle::gHalfLength_ - dist)) };
+        auto light = double{ mcLight * std::exp(-NeulandPaddle::attenuation_ * (NeulandPaddle::gHalfLength_ - dist)) };
         int site_sign = (channel_side == ChannelSide::right) ? 1 : -1;
 
         auto time = double{ mcTime + (NeulandPaddle::gHalfLength_ - dist) / effective_speed_ +

diff --git a/neuland/digitizing/R3BDigitizingPaddleNeuland.h b/neuland/digitizing/R3BDigitizingPaddleNeuland.h
@@ -64,7 +64,7 @@ namespace R3B::Digitizing::Neuland
         // Paula: non static member variables, are not used in TacQuila
         double gHalfLength_ = 135.;   // [cm]
         double gCMedium_ = 14.;       // speed of light in material in [cm/ns]
-        double gAttenuation_ = 0.008; // light attenuation of plastic scintillator [1/cm]
+        double attenuation_ = 0.008; // light attenuation of plastic scintillator [1/cm]
         double gLambda_ = 1. / 2.1;
         double ReverseAttenFac_ = std::exp(NeulandPaddle::gHalfLength * NeulandPaddle::gAttenuation);
         double effective_speed_ = R3B::Neuland::DEFAULT_EFFECTIVE_C;