Change directory organisation

Author: contuandrea

include/deposit.h renamed to include/deposits/deposit.h

@@ -28,16 +28,16 @@
 #ifndef MAIN_INL_
 #define MAIN_INL_
 
-#include <constants.h>
-#include <defaults.h>
-#include <utils.h>
-#include <datatypes.h>
+#include <details/constants.h>
+#include <details/defaults.h>
+#include <details/utils.h>
+#include <details/datatypes.h>
 #include <plotstyle.C>
 #include <loadfiles.h>
-#include <preparemaps.h>
+#include <maps/preparemaps.h>
 #include <analysis.h>
 //facilities
-#include <HydraSim.h>
+#include <simulation/HydraSim.h>
 
 int main(int argv, char** argc){
 

include/constants.h renamed to include/details/constants.h

@@ -28,12 +28,12 @@
 #ifndef MAIN_MAPS_INL_
 #define MAIN_MAPS_INL_
 
-#include <constants.h>
-#include <defaults.h>
-#include <utils.h>
-#include <datatypes.h>
+#include <details/constants.h>
+#include <details/defaults.h>
+#include <details/utils.h>
+#include <details/datatypes.h>
 //facilities
-#include <preparemaps.h>
+#include <maps/preparemaps.h>
 
 int main(int argv, char** argc){
 

include/datatypes.h renamed to include/details/datatypes.h

@@ -24,8 +24,8 @@
  *  Created on: 12/11/2018
  *      Author: Andrea Contu
  */
-#include <Evolve.h>
-#include <simulation.h>
+#include <simulation/Evolve.h>
+#include <simulation/simulation.h>
 
 void signal_simulation(cfg::Setting const& root, int icfg=-1){
 
@@ -53,14 +53,12 @@ void signal_simulation(cfg::Setting const& root, int icfg=-1){
 
     //efield vecs
     VecDev_t<double> _xvec_ef, _yvec_ef, _zvec_ef;
-    
     hydra::multiarray<double,3,hydra::host::sys_t> _vec_ef;
-    VecDev_t<double> efieldvecx, efieldvecy, efieldvecz;
-    //wfield vecs
 
-    hydra::multiarray<double,3,hydra::host::sys_t> _vec_wf;
+    //wfield vecs
     VecDev_t<double> _xvec_wf, _yvec_wf, _zvec_wf;
-    VecDev_t<double> wfieldvecx, wfieldvecy, wfieldvecz;
+    hydra::multiarray<double,3,hydra::host::sys_t> _vec_wf;
+    
 
     //emob vecs
     VecDev_t<double> _xvec_emob, _yvec_emob, _zvec_emob;
@@ -85,7 +83,6 @@ void signal_simulation(cfg::Setting const& root, int icfg=-1){
         pm.prepare();
 
         pm.fillspacepoints<VecDev_t<double> >(_xvec,_yvec,_zvec);
-        pm.fillallquantities<VecDev_t<double> >(efieldvecx,efieldvecy,efieldvecz,emobvec,hmobvec,wfieldvecx,wfieldvecy,wfieldvecz);
         pm.fillallquantities<hydra::multiarray<double,8,hydra::host::sys_t> >(_vec_map);
 
         _xmin = *(pm.getx().begin());
@@ -115,7 +112,6 @@ void signal_simulation(cfg::Setting const& root, int icfg=-1){
             efieldm.prepare();
 
             efieldm.fillspacepoints<VecDev_t<double> >(_xvec_ef,_yvec_ef,_zvec_ef);
-            efieldm.fillvector<VecDev_t<double> >(efieldvecx,efieldvecy,efieldvecz);
             efieldm.fillvector< hydra::multiarray<double,3,hydra::host::sys_t> >(_vec_ef);
 
             for(auto cf:configlist){
@@ -132,7 +128,6 @@ void signal_simulation(cfg::Setting const& root, int icfg=-1){
             maps::physmap<double,6> wfieldm(wfieldmap_path); // Weighting field is a vector
             wfieldm.prepare();
             wfieldm.fillspacepoints<VecDev_t<double> >(_xvec_wf,_yvec_wf,_zvec_wf);
-            wfieldm.fillvector<VecDev_t<double> >(wfieldvecx,wfieldvecy,wfieldvecz);
             wfieldm.fillvector< hydra::multiarray<double,3,hydra::host::sys_t> >(_vec_wf);
 
             std::string emobmap_path=root["PhysicsMaps"]["emob"];