Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed May 29, 2024
1 parent c1618b9 commit d0aaaeb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/03.sensitivity/BabyIAXO.rml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<<<<<<< Updated upstream
<TRestExperiment name="Vacuum" exposureTime="3*300*12hr">
=======

<TRestExperiment name="Vacuum" exposureTime="3*300*12hr" useAverage="true">
>>>>>>> Stashed changes
<!-- Background -->
Expand Down
6 changes: 3 additions & 3 deletions examples/03.sensitivity/IAXO.rml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<TRestExperiment name="Vacuum" exposureTime="6*300*12hr">
=======

<TRestExperiment name="Vacuum" exposureTime="12*300*12hr" useAverage="true">
>>>>>>> Stashed changes
<!-- Background -->
Expand All @@ -23,7 +23,7 @@
conversionType="IAXO" bores="8"
=======
<TRestAxionHelioscopeSignal name="Vacuum" nature="signal" parameter="ma"
conversionType="IAXO" bores="8"
conversionType="IAXO" bores="8"
>>>>>>> Stashed changes
magnetRadius="30cm" magnetLength="20m" magnetStrength="2.5T"
opticsEfficiency="0.7" windowEfficiency="0.8">
Expand Down Expand Up @@ -73,7 +73,7 @@
<TRestExperimentList name="GasPhase" exposureTime="24*12hr"
componentPattern="SignalComponents.root" experimentsFile="GasPhase.settings" >
=======
<TRestExperimentList name="GasPhase" exposureTime="24*12hr"
<TRestExperimentList name="GasPhase" exposureTime="24*12hr"
componentPattern="output/SignalsIAXO.root" experimentsFile="output/IAXO.settings" >
>>>>>>> Stashed changes

Expand Down
2 changes: 1 addition & 1 deletion inc/TRestAxionHelioscopeSignal.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class TRestAxionHelioscopeSignal : public TRestComponent {

public:
Double_t GetSignalRate(std::vector<Double_t> 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; }
Expand Down
1 change: 0 additions & 1 deletion src/TRestAxionField.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
40 changes: 19 additions & 21 deletions src/TRestAxionHelioscopeSignal.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -179,27 +179,25 @@ Double_t TRestAxionHelioscopeSignal::GetSignalRate(std::vector<Double_t> 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
}
Expand Down

0 comments on commit d0aaaeb

Please sign in to comment.