Merge lp:~christopher-hunt08/maus/maus_primary_adjuster into lp:maus/merge

[Christopher Hunt]

Adds a mapper than can be used to shift/scale the momenta of primary particles before simulation.

=== modified file 'src/common_py/ConfigurationDefaults.py'
--- src/common_py/ConfigurationDefaults.py	2018-06-21 04:06:03 +0000
+++ src/common_py/ConfigurationDefaults.py	2018-08-09 11:00:11 +0000
@@ -44,6 +44,9 @@
     "good_pval":0.02,
 }
 
+
+primary_correction = { 'scale' : 1.0, 'shift' : -10.0 }
+
 type_of_dataflow = 'pipeline_single_thread'
 
 input_json_file_name = "maus_input.json"

=== added directory 'src/map/MapCppPrimaryCorrection'
=== added file 'src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.cc'
--- src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.cc	1970-01-01 00:00:00 +0000
+++ src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.cc	2018-08-09 11:00:11 +0000
@@ -0,0 +1,86 @@
+/* This file is part of MAUS: http://micewww.pp.rl.ac.uk:8080/projects/maus
+ *
+ * MAUS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MAUS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MAUS.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <Python.h>
+
+#include <string>
+#include <vector>
+
+#include "src/common_cpp/Utils/Globals.hh"
+#include "src/common_cpp/Globals/GlobalsManager.hh"
+#include "src/common_cpp/API/PyWrapMapBase.hh"
+#include "src/common_cpp/DataStructure/Primary.hh"
+#include "Geant4/G4ParticleTable.hh"
+
+#include "src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.hh"
+
+namespace MAUS {
+
+PyMODINIT_FUNC init_MapCppPrimaryCorrection(void) {
+  PyWrapMapBase<MAUS::MapCppPrimaryCorrection>::PyWrapMapBaseModInit
+                              ("MapCppPrimaryCorrection",
+                               "",
+                               "",
+                               "",
+                               "");
+}
+
+void MapCppPrimaryCorrection::_birth(const std::string& argJsonConfigDocument) {
+  if (!Globals::HasInstance()) {
+    GlobalsManager::InitialiseGlobals(argJsonConfigDocument);
+  }
+  Json::Value* json = Globals::GetConfigurationCards();
+  _momentum_shift = (*json)["primary_correction"]["shift"].asDouble();
+  _momentum_scale = (*json)["primary_correction"]["scale"].asDouble();
+}
+
+void MapCppPrimaryCorrection::_process(MAUS::Data* data) const {
+  Spill* spill = data->GetSpill();
+  std::vector<MCEvent*>* mc = spill->GetMCEvents();
+
+  for (std::vector<MCEvent*>::iterator it = mc->begin(); it != mc->end(); ++it) {
+    Primary* primary = (*it)->GetPrimary();
+
+    double p = primary->GetMomentum().Mag();
+
+    double new_p = (_momentum_scale*p)+_momentum_shift;
+
+    if (new_p < 1.0e-15) {
+      new_p = 1.0; // 1MeV to stop errors. Really we should skip these events!
+    }
+
+//    std::cerr << "Correction p = " << p << " -> " << new_p << std::endl;
+
+    ThreeVector vec = primary->GetMomentum();
+
+    double scale = new_p / p;
+
+    vec.setX(vec.x()*scale);
+    vec.setY(vec.y()*scale);
+    vec.setZ(vec.z()*scale);
+
+    primary->SetMomentum(vec);
+
+    G4ParticleDefinition* particle = G4ParticleTable::GetParticleTable()
+                                                          ->FindParticle(primary->GetParticleId());
+    double mass = particle->GetPDGMass();
+    double energy = sqrt(mass*mass + vec.Mag2());
+
+    primary->SetEnergy(energy);
+  }
+}
+}

=== added file 'src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.hh'
--- src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.hh	1970-01-01 00:00:00 +0000
+++ src/map/MapCppPrimaryCorrection/MapCppPrimaryCorrection.hh	2018-08-09 11:00:11 +0000
@@ -0,0 +1,82 @@
+/* This file is part of MAUS: http://micewww.pp.rl.ac.uk/projects/maus
+ *
+ * MAUS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MAUS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MAUS.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** @class MapCppPrimaryCorrection
+ *  Simulate the JSON input and return JSON input
+ *
+ */
+
+// TODO(Rogers): Error is that we use wrong geant4 devices for this stuff.
+//               Really we should use EventAction to control per spill stuff and
+//               stick multiple tracks from the spill into the same primary
+
+
+#ifndef _SRC_MAP_MAPCPPPRIMARYCORRECTION_HH_
+#define _SRC_MAP_MAPCPPPRIMARYCORRECTION_HH_
+
+// C headers
+#include <stdlib.h>
+
+// C++ headers
+#include <string>
+
+// external libraries
+#include "json/json.h"
+
+//  MAUS code
+#include "src/common_cpp/API/MapBase.hh"
+
+namespace MAUS {
+
+class MapCppPrimaryCorrection : public MapBase<MAUS::Data> {
+ public:
+  /** @brief Sets up the worker
+   */
+  MapCppPrimaryCorrection()
+    : MapBase<MAUS::Data>("MapCppPrimaryCorrection") {
+  }
+
+  ~MapCppPrimaryCorrection() {}
+
+ private:
+  /** @brief Begin the startup procedure for Simulation
+   *
+   *  @param config a JSON document with the configuration.
+   */
+  void _birth(const std::string& argJsonConfigDocument);
+
+  /** @brief NULL op - nothing to death
+   *
+   *  This takes no arguments
+   */
+  void _death() {}
+
+  /** @brief Track JSON input and return new document
+   *
+   *  This function will simulate a single spill defined
+   *  in JSON format.
+   *
+   * @param document a JSON document for a spill
+   */
+  void _process(MAUS::Data* data) const;
+
+  double _momentum_shift;
+  double _momentum_scale;
+};  // Don't forget this trailing colon!!!!
+}
+
+#endif  // _SRC_MAP_MAPCPPPRIMARYCORRECTION_HH_

=== added file 'src/map/MapCppPrimaryCorrection/sconscript'
--- src/map/MapCppPrimaryCorrection/sconscript	1970-01-01 00:00:00 +0000
+++ src/map/MapCppPrimaryCorrection/sconscript	2018-08-09 11:00:11 +0000
@@ -0,0 +1,13 @@
+import glob, os
+
+require_root = True
+require_g4 = True
+
+#get environment and project
+Import('env', 'project')
+localenv = env.Clone()
+
+dir = 'Interface'
+srclst = map(lambda x: os.path.join(dir, x), glob.glob(os.path.join(project,dir, '*.cpp')))
+
+env.jDev.build_project(localenv, project)