Merge branch '240617_electron_yield_okamoto' into master

.gitignore

@@ -33,11 +33,10 @@
 
 
 build/
-build2/
 build*/
 doxygen_documentation/html
 doxygen_documentation/latex
 .vscode/
 CMakeLists.txt
+240617_analysis/*
 
-240617_analysis/*

240617_analysis/okamoto_yield.ipynb

@@ -0,0 +1,55 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "c8b1e8c1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import numpy as np\n",
+    "import matplotlib.pyplot as plt\n",
+    "from scipy.optimize import curve_fit\n",
+    "from uncertainties import ufloat\n",
+    "%matplotlib notebook"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "5242ffa6",
+   "metadata": {},
+   "source": [
+    "# Okamoto glass electron yield"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "e7441a0d",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

common/geometry_construction/include/OMSimOpticalModule.hh

@@ -10,6 +10,7 @@
  */
 #ifndef OpticalModule_h
 #define OpticalModule_h 1
+
 #include "abcDetectorComponent.hh"
 #include "OMSimHitManager.hh"
 #include "OMSimPMTConstruction.hh"

radioactive_decays/include/OMSimYieldSetup.hh

@@ -0,0 +1,24 @@
+#ifndef Cs137Source_h
+#define Cs137Source_h 1
+
+#include "abcDetectorComponent.hh"
+
+class Cs137Source : abcDetectorComponent
+{
+public:
+    Cs137Source(InputDataManager *pData);
+    ~Cs137Source()=default;
+    void construction();
+
+};
+
+class OkamotoLargeSample : abcDetectorComponent
+{
+public:
+    OkamotoLargeSample(InputDataManager *pData);
+    ~OkamotoLargeSample()=default;
+    void construction();
+
+};
+
+#endif

radioactive_decays/src/OMSimRadDecaysDetector.cc

@@ -37,7 +37,14 @@ void OMSimRadDecaysDetector::constructDetector()
 
     case 0:
     {
-        log_critical("No custom detector implemented!");
+        log_info("Constructing Okamoto Cs-137 Source setup for electron yield");
+        OMSimPMTConstruction *lPMTManager = new OMSimPMTConstruction(mData);
+        lPMTManager->selectPMT("argPMT");
+        lPMTManager->construction();
+        lPMTManager->placeIt(G4ThreeVector(0, 0, 0), G4RotationMatrix(), mWorldLogical, "_0");
+        lHitManager.setNumberOfPMTs(1, 0);
+        lPMTManager->configureSensitiveVolume(this, "/PMT/0");
+
         break;
     }
     case 1:

radioactive_decays/src/OMSimYieldSetup.cc

@@ -0,0 +1,12 @@
+
+#include "OMSimYieldSetup.hh"
+
+Cs137Source::Cs137Source(InputDataManager *pData)
+{
+    mData = pData;
+}
+
+OkamotoLargeSample::OkamotoLargeSample(InputDataManager *pData)
+{
+    mData = pData;
+}