diff --git a/examples/03.sensitivity/BabyIAXO.rml b/examples/03.sensitivity/BabyIAXO.rml index 24c850be..48146390 100644 --- a/examples/03.sensitivity/BabyIAXO.rml +++ b/examples/03.sensitivity/BabyIAXO.rml @@ -5,7 +5,7 @@ <<<<<<< Updated upstream ======= - + >>>>>>> Stashed changes diff --git a/examples/03.sensitivity/IAXO.rml b/examples/03.sensitivity/IAXO.rml index 0a26dd6e..22ad5f43 100644 --- a/examples/03.sensitivity/IAXO.rml +++ b/examples/03.sensitivity/IAXO.rml @@ -6,7 +6,7 @@ ======= - + >>>>>>> Stashed changes @@ -23,7 +23,7 @@ conversionType="IAXO" bores="8" ======= >>>>>> Stashed changes magnetRadius="30cm" magnetLength="20m" magnetStrength="2.5T" opticsEfficiency="0.7" windowEfficiency="0.8"> @@ -73,7 +73,7 @@ ======= - >>>>>>> Stashed changes diff --git a/inc/TRestAxionHelioscopeSignal.h b/inc/TRestAxionHelioscopeSignal.h index bb4cd2aa..985fd4fd 100644 --- a/inc/TRestAxionHelioscopeSignal.h +++ b/inc/TRestAxionHelioscopeSignal.h @@ -69,7 +69,7 @@ class TRestAxionHelioscopeSignal : public TRestComponent { public: Double_t GetSignalRate(std::vector point, Double_t mass = 0); - Double_t GetSignalRate(Double_t mass, Double_t Eo, Double_t Ef); + Double_t GetSignalRate(Double_t mass, Double_t Eo, Double_t Ef); TRestAxionBufferGas* GetGas() { return fGas; } TRestAxionSolarFlux* GetFlux() { return fFlux; } diff --git a/src/TRestAxionField.cxx b/src/TRestAxionField.cxx index 60f14b97..d6713d32 100644 --- a/src/TRestAxionField.cxx +++ b/src/TRestAxionField.cxx @@ -298,7 +298,6 @@ Double_t TRestAxionField::GammaTransmissionProbability(Double_t Ea, Double_t ma, Double_t photonMass = mg; - if (mg == 0 && fBufferGas) photonMass = fBufferGas->GetPhotonMass(fEa); RESTDebug << "+--------------------------------------------------------------------------+" << RESTendl; diff --git a/src/TRestAxionHelioscopeSignal.cxx b/src/TRestAxionHelioscopeSignal.cxx index 6e350056..46bab0db 100644 --- a/src/TRestAxionHelioscopeSignal.cxx +++ b/src/TRestAxionHelioscopeSignal.cxx @@ -179,27 +179,25 @@ Double_t TRestAxionHelioscopeSignal::GetSignalRate(std::vector point, /// given by argument. /// Double_t TRestAxionHelioscopeSignal::GetSignalRate(Double_t mass, Double_t Eo, Double_t Ef) { - - std::cout << "A" << std::endl; - Double_t dE = 0.5; - - Double_t signal = 0; - for( Double_t en = Eo; en < Ef; en += dE ) - { - Double_t flux = fFlux->GetFluxAtEnergy(en, mass); // cm-2 s-1 keV-1 - - /// This is copy/paste from previous method. Sorry for doing this. - Double_t probability = 0; - if (fConversionType == "IAXO") { - probability = - fOpticsEfficiency * fWindowEfficiency * fField->GammaTransmissionProbability(en, mass); - - // We assume all flux ends up inside the spot. No XY dependency of signal. - Double_t apertureArea = TMath::Pi() * fMagnetRadius * units("cm") * fMagnetRadius * units("cm"); - flux *= fBores * apertureArea; - } - signal += flux * probability; - } + std::cout << "A" << std::endl; + Double_t dE = 0.5; + + Double_t signal = 0; + for (Double_t en = Eo; en < Ef; en += dE) { + Double_t flux = fFlux->GetFluxAtEnergy(en, mass); // cm-2 s-1 keV-1 + + /// This is copy/paste from previous method. Sorry for doing this. + Double_t probability = 0; + if (fConversionType == "IAXO") { + probability = + fOpticsEfficiency * fWindowEfficiency * fField->GammaTransmissionProbability(en, mass); + + // We assume all flux ends up inside the spot. No XY dependency of signal. + Double_t apertureArea = TMath::Pi() * fMagnetRadius * units("cm") * fMagnetRadius * units("cm"); + flux *= fBores * apertureArea; + } + signal += flux * probability; + } return signal * dE; // s-1 }