pr409

Author: HaiwangYu

gen/inc/WireCellGen/Scaler.h

@@ -36,12 +36,19 @@ namespace WireCell {
       double bin_width;
       double tpc_width;
       double bin_height;
+      int n_ybin;
+      int n_zbin;
+      double yoffset;
+      double zoffset;
       int plane;
       std::string anode_name;
+      std::string yzmap_scale_filename;
       //Json::Value map = Json::arrayValue;
       //Json::arrayValue map;
       Json::Value jmap;
 
+      std::vector<std::vector<double>> yzmap;
+
 
     };  // Scaler
 

gen/src/Scaler.cxx

@@ -24,6 +24,16 @@ using namespace WireCell;
 
 Gen::Scaler::Scaler()
   : Aux::Logger("Scaler", "gen")
+  , yzmap_scale_filename("Empty")
+  , bin_width(0.0*units::cm)
+  , tpc_width(0.0*units::mm)
+  , bin_height(0.0*units::cm)
+  , n_ybin(31)
+  , n_zbin(180)
+  , yoffset(180*units::cm)// ymin is -180 in ICARUS
+  , zoffset(900*units::cm)// zmin is -900 in ICARUS
+  , anode_name("Empty")
+  , plane(0)
 {
 }
 
@@ -33,12 +43,16 @@ WireCell::Configuration Gen::Scaler::default_configuration() const
 {
   Configuration cfg;
 
-  cfg["yzmap_scale_filename"] = "YZMap_Scale_filename";
-  cfg["bin_width"]      = "BinWidth";
-  cfg["tpc_width"]      = "TPCWidth";
-  cfg["bin_height"]     = "BinHeight";
-  cfg["anode"]          = "AnodePlane";
-  cfg["plane"]          = "WirePlane";
+  cfg["yzmap_scale_filename"] = yzmap_scale_filename;
+  cfg["bin_width"]      = bin_width;
+  cfg["tpc_width"]      = tpc_width;
+  cfg["bin_height"]     = bin_height;
+  cfg["n_ybin"]     = n_ybin;
+  cfg["n_zbin"]     = n_zbin;
+  cfg["yoffset"]     = yoffset;
+  cfg["zoffset"]     = zoffset;
+  cfg["anode"]          = anode_name;
+  cfg["plane"]          = plane;
   return cfg;
 }
 
@@ -67,15 +81,26 @@ void Gen::Scaler::configure(const WireCell::Configuration& cfg)
     m_boxes.push_back(face->sensitive());
   }
   //    log->debug("Rest...");
-  bin_width =  get<double>(cfg, "bin_width");
-  tpc_width =  get<double>(cfg, "tpc_width");
-  bin_height = get<double>(cfg, "bin_height");
-  plane =      get<int>   (cfg, "plane");
+  bin_width =  get<double>(cfg, "bin_width", bin_width);
+  tpc_width =  get<double>(cfg, "tpc_width", tpc_width);
+  bin_height = get<double>(cfg, "bin_height", bin_height);
+  plane =      get<int>   (cfg, "plane", plane);
 
-  anode_name = get<std::string>(cfg, "anode");
+  anode_name = get<std::string>(cfg, "anode", anode_name);
 
   jmap = WireCell::Persist::load(filename);
 
+  yzmap.resize(n_zbin);
+  for(int binz = 0; binz < n_zbin; binz++){
+    yzmap[binz].resize(n_ybin);
+    for(int biny = 0; biny < n_ybin; biny++){
+      yzmap[binz][biny] = jmap[anode_name][std::to_string(plane)][binz][biny].asDouble();
+    }
+  }
+
+  jmap.clear();
+
+
 }
 
 void Gen::Scaler::reset() { }
@@ -100,10 +125,8 @@ bool Gen::Scaler::operator()(const input_pointer& depo, output_queue& outq)
     }
   }
 
-  double depo_y = depo->pos().y()*units::mm;
-  double depo_z = depo->pos().z()*units::mm;
-  double yoffset = 180*units::cm;
-  double zoffset = 900*units::cm;
+  double depo_y = depo->pos().y();
+  double depo_z = depo->pos().z();
 
   int depo_bin_y = std::floor((depo_y+yoffset)/bin_height);
   int depo_bin_z = std::floor((depo_z+zoffset)/bin_width);
@@ -116,18 +139,17 @@ bool Gen::Scaler::operator()(const input_pointer& depo, output_queue& outq)
     depo_bin_z = 0;
   }
 
-  if(depo_bin_y > 31){
-    depo_bin_y = 31;
+  if(depo_bin_y > n_ybin){
+    depo_bin_y = n_ybin;
   }
 
-  if(depo_bin_z > 180){
-    depo_bin_z = 180;
+  if(depo_bin_z > n_zbin){
+    depo_bin_z = n_zbin;
   }
 
-  //  double scale = (jmap[anode_name][std::to_string(plane)][depo_bin_y][depo_bin_z].asDouble());
-  double scale = (jmap[anode_name][std::to_string(plane)][depo_bin_z][depo_bin_y].asDouble());
+  double scale = yzmap[depo_bin_z][depo_bin_y];
 
-  auto newdepo = make_shared<Aux::SimpleDepo>(depo->time(), depo->pos(), Qi*scale, depo, depo->extent_long(), depo->extent_tran());
+  auto newdepo = make_shared<Aux::SimpleDepo>(depo->time(), depo->pos(), Qi*scale, depo->prior(), depo->extent_long(), depo->extent_tran(), depo->prior()->id(), depo->prior()->pdg(), depo->prior()->energy());
 
   outq.push_back(newdepo);