From 87a068648bb0a9eb19c1a2cdea280e9199e12323 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Wed, 19 Mar 2025 10:50:36 -0400
Subject: [PATCH 01/10] Implementation of recoil TOF geometry for RGH

---
 geometry_source/recoil_tof/GeoArgParse.groovy | 18 ++++
 geometry_source/recoil_tof/config.dat         | 23 +++++
 geometry_source/recoil_tof/factory.groovy     | 24 +++++
 geometry_source/recoil_tof/geometry_java.pl   | 85 +++++++++++++++++
 geometry_source/recoil_tof/materials.pl       | 21 +++++
 geometry_source/recoil_tof/recoil_tof.gcard   | 29 ++++++
 geometry_source/recoil_tof/recoil_tof.pl      | 91 +++++++++++++++++++
 7 files changed, 291 insertions(+)
 create mode 100644 geometry_source/recoil_tof/GeoArgParse.groovy
 create mode 100644 geometry_source/recoil_tof/config.dat
 create mode 100644 geometry_source/recoil_tof/factory.groovy
 create mode 100755 geometry_source/recoil_tof/geometry_java.pl
 create mode 100755 geometry_source/recoil_tof/materials.pl
 create mode 100644 geometry_source/recoil_tof/recoil_tof.gcard
 create mode 100755 geometry_source/recoil_tof/recoil_tof.pl

diff --git a/geometry_source/recoil_tof/GeoArgParse.groovy b/geometry_source/recoil_tof/GeoArgParse.groovy
new file mode 100644
index 00000000..0d48250d
--- /dev/null
+++ b/geometry_source/recoil_tof/GeoArgParse.groovy
@@ -0,0 +1,18 @@
+
+class GeoArgParse {
+    static String defaultVariation="default";
+    static int defaultRunNumber=11;
+    static String getVariation(String[] args) {
+        for (int ii=0; ii<args.length-1; ii++) {
+            if (args[ii].equals("--variation")) return args[ii+1];
+        }
+        throw new RuntimeException("GeoArgParse:  '--variation variationName' is required.");
+    }
+    static int getRunNumber(String[] args) {
+        for (int ii=0; ii<args.length-1; ii++) {
+            if (args[ii].equals("--runnumber")) return Integer.parseInt(args[ii+1]);
+        }
+        throw new RuntimeException("GeoArgParse:  '--runnumber runNumber' is required.");
+    }
+}
+
diff --git a/geometry_source/recoil_tof/config.dat b/geometry_source/recoil_tof/config.dat
new file mode 100644
index 00000000..f7dcc421
--- /dev/null
+++ b/geometry_source/recoil_tof/config.dat
@@ -0,0 +1,23 @@
+# Configuration file for recoil
+
+# Detector name and variation
+detector_name: recoil_tof
+variation:     default
+
+# Factory can be MYQL or TEXT
+factory:       TEXT 
+
+# run ranges and variation will apply to geometry, materials and parameters
+rmin:       1
+rmax:       10000
+
+# MYSQL server and databse if MYSQL factory is selected
+dbhost: clasdb.jlab.org
+
+# Comments/Description
+comment:       This is the first implementation of the recoil tof
+
+# Verbosity controls the perl script output
+verbosity: 0
+
+
diff --git a/geometry_source/recoil_tof/factory.groovy b/geometry_source/recoil_tof/factory.groovy
new file mode 100644
index 00000000..fd27026d
--- /dev/null
+++ b/geometry_source/recoil_tof/factory.groovy
@@ -0,0 +1,24 @@
+//============================================================
+// This script prints volumes for RECOIL detector
+//============================================================
+import org.jlab.geom.base.*;
+import org.jlab.clasrec.utils.*;
+import org.jlab.detector.geant4.v2.recoil_tof.*;
+import org.jlab.detector.base.*;
+
+import GeoArgParse
+def variation = GeoArgParse.getVariation(args);
+def runNumber = GeoArgParse.getRunNumber(args);
+
+
+ConstantProvider cp = GeometryFactory.getConstants(DetectorType.FTOF,runNumber,"default");
+//cp.show();
+
+RecoilTOFGeant4Factory factory = new RecoilTOFGeant4Factory(cp);
+
+def outFile = new File("recoil_tof__volumes_"+variation+".txt");
+
+outFile.newWriter().withWriter { w ->
+	w<<factory;
+}
+
diff --git a/geometry_source/recoil_tof/geometry_java.pl b/geometry_source/recoil_tof/geometry_java.pl
new file mode 100755
index 00000000..435abd1e
--- /dev/null
+++ b/geometry_source/recoil_tof/geometry_java.pl
@@ -0,0 +1,85 @@
+package coatjava;
+
+use strict;
+use warnings;
+
+use geometry;
+my $mothers;
+my $positions;
+my $rotations;
+my $types;
+my $dimensions;
+my $ids;
+ 
+sub make_sector
+{
+    my $nSectors = 2;
+    my $nRows = 5;
+    my $nCols = 63;
+
+    
+    for(my $s=1; $s<=$nSectors; $s++)
+    {
+	my %detector = init_det();
+	my $vname = "recoil_tof_sector$s";
+        
+	$detector{"name"}        = $vname;
+	$detector{"mother"}      = $mothers->{$vname};
+	$detector{"description"} = "CLAS12 recoil TOF, Sector $s";
+	$detector{"pos"}         = $positions->{$vname};
+	$detector{"rotation"}    = $rotations->{$vname};
+	$detector{"type"}        = $types->{$vname};
+	$detector{"dimensions"}  = $dimensions->{$vname};
+	$detector{"color"}       = "aa0000";
+	$detector{"material"}    = "G4_Galactic";
+	$detector{"style"}       = 0;
+	$detector{"visible"}     = 0;
+	print_det(\%main::configuration, \%detector);
+
+	for(my $row=1; $row<=$nRows; $row++) {
+	    for(my $col=1; $col<=$nCols; $col++) {
+		make_bar($s, $row, $col);
+    	    }
+	}
+    }	
+    
+}
+
+sub make_bar
+{
+    my $iSector = $_[0];
+    my $iRow = $_[1];
+    my $iCol =$_[2];
+    
+    my %detector = init_det();
+
+    my $vname = "bar_sector${iSector}_row${iRow}_column${iCol}";
+
+    $detector{"name"}        = $vname;
+    $detector{"mother"}      = $mothers->{$vname};
+    $detector{"description"} = "Sector $iSector, Bar, row $iRow, column $iCol";
+    $detector{"pos"}         = $positions->{$vname};
+    $detector{"rotation"}    = $rotations->{$vname};
+    $detector{"type"}        = $types->{$vname};
+    $detector{"dimensions"}  = $dimensions->{$vname};
+    $detector{"color"}    = "aa0000";
+    $detector{"material"} = "scintillator";
+    $detector{"style"}    = 0;
+    $detector{"visible"}  = 1;
+
+    print_det(\%main::configuration, \%detector);
+        
+}
+
+
+sub makeRECOILTOF
+{
+
+    ($mothers, $positions, $rotations, $types, $dimensions, $ids) = @main::volumes;
+   
+    make_sector();
+
+
+}
+
+1;
diff --git a/geometry_source/recoil_tof/materials.pl b/geometry_source/recoil_tof/materials.pl
new file mode 100755
index 00000000..fce03b19
--- /dev/null
+++ b/geometry_source/recoil_tof/materials.pl
@@ -0,0 +1,21 @@
+use strict;
+use warnings;
+
+our %configuration;
+
+
+sub materials
+{
+	# uploading the mat definition
+	
+	# Scintillator
+	my %mat = init_mat();
+	$mat{"name"}          = "scintillator";
+	$mat{"description"}   = "recoil tof scintillator material";
+	$mat{"density"}       = "1.032";
+	$mat{"ncomponents"}   = "2";
+	$mat{"components"}    = "C 9 H 10";
+	print_mat(\%configuration, \%mat);
+	
+}
+
diff --git a/geometry_source/recoil_tof/recoil_tof.gcard b/geometry_source/recoil_tof/recoil_tof.gcard
new file mode 100644
index 00000000..e132a383
--- /dev/null
+++ b/geometry_source/recoil_tof/recoil_tof.gcard
@@ -0,0 +1,29 @@
+<gcard>
+
+	<option name="geometry" value="1400x1200"/>
+
+
+	<detector name="recoil_tof" factory="TEXT" variation="default"/>
+	
+
+	<option name="BEAM_P"     value="e-, 5.0*GeV, 25*deg, 0*deg"/>
+	<option name="SPREAD_P"   value="1.0*GeV, 15*deg, 180*deg"/> 
+	<option name="INTEGRATEDRAW" value="dc"/>
+
+	<!-- you can scale the fields here. Remember torus -1 means e- INBENDING  -->
+	<option name="SCALE_FIELD" value="binary_torus, -1"/>
+	<option name="SCALE_FIELD" value="binary_solenoid, -1"/>
+
+	<!-- hall field  -->
+	<option name="HALL_FIELD"  value="Symm_solenoid_r601_phi1_z1201_13June2018:Symm_torus_r2501_phi16_z251_24Apr2018"/>
+
+	<option name="SAVE_ALL_MOTHERS" value="1"/>
+
+
+
+	<option name="OUTPUT"                  value="hipo, out.hipo"/>
+	<option name="PHYSICS"                 value="STD + FTFP_BERT"/>
+	<option name="RUNNO"                   value="11" />
+	<option name="DIGITIZATION_VARIATION"  value="rga_fall2018_mc" />
+
+</gcard>
diff --git a/geometry_source/recoil_tof/recoil_tof.pl b/geometry_source/recoil_tof/recoil_tof.pl
new file mode 100755
index 00000000..d73609b0
--- /dev/null
+++ b/geometry_source/recoil_tof/recoil_tof.pl
@@ -0,0 +1,91 @@
+#!/usr/bin/perl -w
+
+use strict;
+use lib ("$ENV{GEMC}/api/perl");
+use utils;
+use parameters;
+use geometry;
+use hit;
+use bank;
+use math;
+use materials;
+
+use Math::Trig;
+
+# Help Message
+sub help()
+{
+	print "\n Usage: \n";
+	print "   recoil_tof.pl <configuration filename>\n";
+ 	print "   Will create the CLAS12 recoil tof geometry, materials, bank and hit definitions\n";
+	exit;
+}
+
+# Make sure the argument list is correct
+if( scalar @ARGV != 1)
+{
+	help();
+	exit;
+}
+
+# Loading configuration file and paramters
+our %configuration = load_configuration($ARGV[0]);
+#$configuration{"variation"} = "default" ;
+
+# Global pars - these should be read by the load_parameters from file or DB
+
+
+# materials
+require "./materials.pl";
+
+# banks definitions
+#require "./bank.pl";
+
+# hits definitions
+#require "./hit.pl";
+
+#system("which run-groovy");
+
+# sensitive geometry
+require "./geometry_java.pl";
+
+
+# all the scripts must be run for every configuration
+# Right now run both configurations, later on just ccdb
+#my @allConfs = ("ccdb", "cosmicR1", "ddvcs", "java");
+#my @allConfs = ("default");
+
+my @allConfs = ("default");
+
+# bank definitions common to all variations
+#define_bank();
+
+#foreach my $conf ( @allConfs ){
+for(my $ii=0; $ii<=$#allConfs; $ii++){
+#	$configuration{"variation"} = $conf ;
+    $configuration{"variation"} = $allConfs[$ii];
+    print "$configuration{variation}\n";
+
+    system("/w/hallb-scshelf2102/clas12/users/nwickjlb/coatjava_edit/coatjava/coatjava/bin/run-groovy factory.groovy --variation $configuration{variation}  --runnumber 11");
+    #system("groovy -cp '../*:..' factory.groovy --variation $configuration{variation} --runnumber 11");
+
+  #  %configuration = $configuration{"variation"};
+    
+	# materials
+	materials();
+
+	# hits
+        #define_hit();
+	
+
+	# sensitive geometry
+	# Global pars - these should be read by the load_parameters from file or DB
+    our @volumes = get_volumes(%configuration);
+
+
+    print "variation default\n";
+    print "configuration{$configuration{variation})\n";
+    coatjava::makeRECOILTOF();
+    
+}
+

From ae0436e0fbac0582da1c25d2345a4f6bedc25d78 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Wed, 19 Mar 2025 10:58:01 -0400
Subject: [PATCH 02/10] Change file description to match with recoil TOF

---
 geometry_source/recoil_tof/config.dat     | 2 +-
 geometry_source/recoil_tof/factory.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/geometry_source/recoil_tof/config.dat b/geometry_source/recoil_tof/config.dat
index f7dcc421..561b9824 100644
--- a/geometry_source/recoil_tof/config.dat
+++ b/geometry_source/recoil_tof/config.dat
@@ -1,4 +1,4 @@
-# Configuration file for recoil
+# Configuration file for recoil TOF
 
 # Detector name and variation
 detector_name: recoil_tof
diff --git a/geometry_source/recoil_tof/factory.groovy b/geometry_source/recoil_tof/factory.groovy
index fd27026d..fbb8701a 100644
--- a/geometry_source/recoil_tof/factory.groovy
+++ b/geometry_source/recoil_tof/factory.groovy
@@ -1,5 +1,5 @@
 //============================================================
-// This script prints volumes for RECOIL detector
+// This script prints volumes for RECOIL TOF detector
 //============================================================
 import org.jlab.geom.base.*;
 import org.jlab.clasrec.utils.*;

From 78eafcc5cc7799c6fbed2fcd7313f2090eb8b474 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Thu, 20 Mar 2025 11:39:44 -0400
Subject: [PATCH 03/10] Initial implementation of digitization for RGH recoil
 TOF

---
 geometry_source/recoil_tof/bank.pl            |  36 +++
 geometry_source/recoil_tof/geometry_java.pl   |   5 +-
 geometry_source/recoil_tof/hit.pl             |  23 ++
 geometry_source/recoil_tof/recoil_tof.gcard   |   4 +-
 source/SConstruct                             |   3 +-
 source/hitprocess/HitProcess_MapRegister.cc   |   2 +
 .../recoil_tof/recoil_tof_hitprocess.cc       | 293 ++++++++++++++++++
 .../clas12/recoil_tof/recoil_tof_hitprocess.h |  68 ++++
 source/output/hipoSchemas.cc                  |   7 +-
 source/output/hipoSchemas.h                   |   1 +
 source/output/hipo_output.h                   |   1 +
 11 files changed, 437 insertions(+), 6 deletions(-)
 create mode 100755 geometry_source/recoil_tof/bank.pl
 create mode 100644 geometry_source/recoil_tof/hit.pl
 create mode 100644 source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
 create mode 100644 source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.h

diff --git a/geometry_source/recoil_tof/bank.pl b/geometry_source/recoil_tof/bank.pl
new file mode 100755
index 00000000..0ff8e58b
--- /dev/null
+++ b/geometry_source/recoil_tof/bank.pl
@@ -0,0 +1,36 @@
+use strict;
+use warnings;
+
+our %configuration;
+
+# Variable Type is two chars.
+# The first char:
+#  R for raw integrated variables
+#  D for dgt integrated variables
+#  S for raw step by step variables
+#  M for digitized multi-hit variables
+#  V for voltage(time) variables
+#
+# The second char:
+# i for integers
+# d for doubles
+
+sub define_bank
+{
+	my $bankname = shift;
+	my $bankId   = shift;	
+	
+	insert_bank_variable(\%configuration, $bankname, "bankid",   $bankId, "Di", "$bankname bank ID");
+	insert_bank_variable(\%configuration, $bankname, "sector",       1, "Di", "recoil tof sector");
+	insert_bank_variable(\%configuration, $bankname, "row",        2, "Di", "recoil tof row");
+	insert_bank_variable(\%configuration, $bankname, "column",    3, "Di", "recoil tof column");
+	insert_bank_variable(\%configuration, $bankname, "TDC_order",    4, "Di", "order 0/1 for up/downstream");
+	insert_bank_variable(\%configuration, $bankname, "TDC_TDC",      5, "Di", "TDC");
+	insert_bank_variable(\%configuration, $bankname, "TDC_ToT" ,     6, "Di", "ToT");
+	insert_bank_variable(\%configuration, $bankname, "hitn",        99, "Di", "hit number");
+}
+
+sub define_banks {
+	define_bank("recoil_tof", 22700);
+}
+
diff --git a/geometry_source/recoil_tof/geometry_java.pl b/geometry_source/recoil_tof/geometry_java.pl
index 435abd1e..ec48fd85 100755
--- a/geometry_source/recoil_tof/geometry_java.pl
+++ b/geometry_source/recoil_tof/geometry_java.pl
@@ -66,7 +66,10 @@ sub make_bar
     $detector{"material"} = "scintillator";
     $detector{"style"}    = 0;
     $detector{"visible"}  = 1;
-
+    $detector{"sensitivity"} = "recoil_tof";
+    $detector{"hit_type"} = "recoil_tof";
+    # set the identifiers
+    $detector{"identifiers"}  = "sector manual $iSector row manual $iRow column manual $iCol order manual 0";
     print_det(\%main::configuration, \%detector);
         
 }
diff --git a/geometry_source/recoil_tof/hit.pl b/geometry_source/recoil_tof/hit.pl
new file mode 100644
index 00000000..18c9ad85
--- /dev/null
+++ b/geometry_source/recoil_tof/hit.pl
@@ -0,0 +1,23 @@
+use strict;
+use warnings;
+
+our %configuration;
+
+sub define_hit
+{
+	# uploading the hit definition
+	my %hit = init_hit();
+	$hit{"name"}            = "recoil_tof";
+	$hit{"description"}     = "recoil tof hit definitions ";
+	$hit{"identifiers"}     = "sector row column";
+	$hit{"signalThreshold"} = "0.5*MeV";
+	$hit{"timeWindow"}      = "400*ns";
+	$hit{"prodThreshold"}   = "1*mm";
+	$hit{"maxStep"}         = "1*cm";
+	$hit{"delay"}           = "50*ns";
+	$hit{"riseTime"}        = "0.7*ns";
+	$hit{"fallTime"}        = "1.8*ns";
+	$hit{"mvToMeV"}         = 100;
+	$hit{"pedestal"}        = -20;
+	print_hit(\%configuration, \%hit);
+}
diff --git a/geometry_source/recoil_tof/recoil_tof.gcard b/geometry_source/recoil_tof/recoil_tof.gcard
index e132a383..64ccac45 100644
--- a/geometry_source/recoil_tof/recoil_tof.gcard
+++ b/geometry_source/recoil_tof/recoil_tof.gcard
@@ -6,8 +6,8 @@
 	<detector name="recoil_tof" factory="TEXT" variation="default"/>
 	
 
-	<option name="BEAM_P"     value="e-, 5.0*GeV, 25*deg, 0*deg"/>
-	<option name="SPREAD_P"   value="1.0*GeV, 15*deg, 180*deg"/> 
+	<option name="BEAM_P"     value="e-, 5.0*GeV, 50*deg, 0*deg"/>
+	<option name="SPREAD_P"   value="1.0*GeV, 5*deg, 0*deg"/> 
 	<option name="INTEGRATEDRAW" value="dc"/>
 
 	<!-- you can scale the fields here. Remember torus -1 means e- INBENDING  -->
diff --git a/source/SConstruct b/source/SConstruct
index 40ad6d43..3805f9f9 100644
--- a/source/SConstruct
+++ b/source/SConstruct
@@ -110,7 +110,7 @@ env.Library(source = field_sources, target = "lib/gfields")
 
 
 # Hit Processes
-env.Append(CPPPATH = ['hitprocess', 'hitprocess/clas12', 'hitprocess/clas12/svt', 'hitprocess/clas12/micromegas', 'hitprocess/clas12/alert', 'hitprocess/clas12/recoil'])
+env.Append(CPPPATH = ['hitprocess', 'hitprocess/clas12', 'hitprocess/clas12/svt', 'hitprocess/clas12/micromegas', 'hitprocess/clas12/alert', 'hitprocess/clas12/recoil', 'hitprocess/clas12/recoil_tof'])
 env.Append(CPPPATH = ['hitprocess/Aprime', 'hitprocess/GlueX', 'hitprocess/solid'])
 hitp_sources = Split("""
 	hitprocess/HitProcess_MapRegister.cc
@@ -145,6 +145,7 @@ hitp_sources = Split("""
  	hitprocess/clas12/uRwell/uRwell_strip.cc
         hitprocess/clas12/recoil/recoil_hitprocess.cc	
         hitprocess/clas12/recoil/recoil_strip.cc
+	hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
 	hitprocess/bdx/cormo_hitprocess.cc
 	hitprocess/bdx/veto_hitprocess.cc
 	hitprocess/bdx/crs_hitprocess.cc
diff --git a/source/hitprocess/HitProcess_MapRegister.cc b/source/hitprocess/HitProcess_MapRegister.cc
index 0ddacd45..6143d4d5 100644
--- a/source/hitprocess/HitProcess_MapRegister.cc
+++ b/source/hitprocess/HitProcess_MapRegister.cc
@@ -27,6 +27,7 @@
 #include "clas12/rtpc_hitprocess.h"             ///< Radial Time Projection Chamber (RTPC)
 #include "clas12/uRwell/uRwell_hitprocess.h"    ///< uRwell detector
 #include "clas12/recoil/recoil_hitprocess.h"    ///< RGH recoil detector
+#include "clas12/recoil_tof/recoil_tof_hitprocess.h"    ///< RGH recoil TOF detector
 
 // Beam Dump eXperiment
 #include "bdx/cormo_hitprocess.h"               ///< Cormorino detector
@@ -93,6 +94,7 @@ map<string, HitProcess_Factory> HitProcess_Map(string experiments)
 			hitMap["rtpc"]      = &rtpc_HitProcess::createHitClass;
 			hitMap["urwell"]    = &uRwell_HitProcess::createHitClass;
 			hitMap["recoil"]    = &recoil_HitProcess::createHitClass;
+			hitMap["recoil_tof"]    = &recoil_tof_HitProcess::createHitClass;
 		} else if(EXP == "HPS") {
 			// Aprime
 			hitMap["SVT"]        = &SVT_HitProcess::createHitClass;
diff --git a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
new file mode 100644
index 00000000..ab353254
--- /dev/null
+++ b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
@@ -0,0 +1,293 @@
+// G4 headers
+#include "G4Poisson.hh"
+#include "Randomize.hh"
+
+#include <CCDB/Calibration.h>
+#include <CCDB/Model/Assignment.h>
+#include <CCDB/CalibrationGenerator.h>
+using namespace ccdb;
+
+// gemc headers
+#include "recoil_tof_hitprocess.h"
+
+// CLHEP units
+#include "CLHEP/Units/PhysicalConstants.h"
+using namespace CLHEP;
+
+static recoil_tofConstants initializeRECOILTOFConstants(int runno, string digiVariation = "default") {
+	recoil_tofConstants atc;
+	
+	// do not initialize at the beginning, only after the end of the first event,
+	// with the proper run number coming from options or run table
+	if (runno == -1) return atc;
+	
+	atc.runNo = runno;
+	if (getenv("CCDB_CONNECTION") != nullptr)
+		atc.connection = (string) getenv("CCDB_CONNECTION");
+	else
+		atc.connection = "mysql://clas12reader@clasdb.jlab.org/clas12";
+	
+	return atc;
+}
+
+
+// this methos is for implementation of digitized outputs and the first one that needs to be implemented.
+map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
+	
+	// digitized output
+	map<string, double> dgtz;
+	vector<identifier> identity = aHit->GetId();
+	rejectHitConditions = false;
+	writeHit = true;
+
+	
+	int recoil_tof_sector     = identity[0].id;
+	int recoil_tof_row        = identity[1].id; 
+	int recoil_tof_column     = identity[2].id;
+	int recoil_tof_order      = identity[3].id;
+
+	double time_to_tdc = 1./0.015625;
+	
+	if(aHit->isBackgroundHit == 1) {
+		
+		double totEdep  = aHit->GetEdep()[0];
+		double stepTime = aHit->GetTime()[0];
+		double tdc      = stepTime * time_to_tdc;
+
+		dgtz["hitn"]      = hitn;
+		dgtz["sector"]    = recoil_tof_sector; //Sector ranges from 1 to 2
+		dgtz["row"]     = recoil_tof_row; //Row ranges from 1 to 5
+		dgtz["column"] = recoil_tof_column; //Column ranges from 1 to 63 
+		dgtz["TDC_order"] = recoil_tof_order; //order is 0/1 for front(upstream)/back(downstream)
+		dgtz["TDC_ToT"]   = (int) totEdep;
+		dgtz["TDC_TDC"]  = tdc; 
+		return dgtz;
+	}
+	
+	trueInfos tInfos(aHit);
+	
+	double length = aHit->GetDetector().dimensions[1]; // half length of bar along y direction
+	double thickness = 2 * aHit->GetDetector().dimensions[2]; // thickness of bar
+	
+	vector<G4double>      Edep  = aHit->GetEdep();
+	vector<G4ThreeVector> Lpos  = aHit->GetLPos(); // local position at each step
+	vector<double>        times = aHit->GetTime();
+	
+	double adc_CC_front, adc_CC_back, tdc_CC_front, tdc_CC_back;
+	
+	double LposX=0.0;
+	double LposY=0.0;
+	double LposZ=0.0;
+	
+	// Simple output not equal to real physics, just to feel the adc, time values
+	// Should be: double energy = tInfos.eTot*att;
+	
+	double totEdep=0.0;
+	
+	//Distance calculation from the hit to the front or back SIPM
+	double dFront = 0.0;
+	double dBack = 0.0; 
+	double e_Front = 0.0;
+	double e_Back = 0.0;
+	double E_tot_Front = 0.0;
+	double E_tot_Back = 0.0;
+		
+	double attlength = 160.0; // EJ-204 160 cm
+	double pmtPEYld = 10400.0; // EJ-204 10400 (photons / [1MeV*e-])
+	double dEdxMIP = 1.956; // energy deposited by MIP per cm of scintillator material, to be adapted for SiPM case, it is a function of ?
+	
+	//Variables for tdc calculation (time)
+	double EtimesTime_Front=0.0;
+	double EtimesTime_Back=0.0;
+	double  v_eff_Front = 20.0; // cm/ns! CND v_eff = 16 cm/ns
+	double  v_eff_Back = 20.0;
+
+	/*
+	double dist_h_SiPMFront =0.0;
+	double dist_h_SiPMBack =0.0;
+	*/
+	// cout << "First loop on steps begins" << endl;
+	
+	
+	// notice these calculations are done both for front and back
+	// this can be optimized to have just one calculation using order as discriminating value
+	for(unsigned int s=0; s<tInfos.nsteps; s++)
+	{
+		LposX = Lpos[s].x();
+		LposY = Lpos[s].y();
+		LposZ = Lpos[s].z();
+		
+		dFront = length - LposZ;
+		dBack = length + LposZ;
+		e_Front = Edep[s] *exp(-dFront/attlength); // value for just one step, in MeV!
+		e_Back = Edep[s] *exp(-dBack/attlength);
+		E_tot_Front = E_tot_Front + e_Front; // to sum over all the steps of the hit
+		E_tot_Back = E_tot_Back + e_Back;
+			
+		// to check the totEdep MC truth value
+		totEdep = totEdep + Edep[s];
+			
+		// times[s] is in ns!
+		EtimesTime_Front = EtimesTime_Front + (times[s] + dFront/v_eff_Front)*e_Front;
+		EtimesTime_Back = EtimesTime_Back + (times[s] + dBack/v_eff_Back)*e_Back;
+			
+		//cout << "Distance from hit to Front SIPM, to Back SiPM (mm): " << dFront << ", "<< dBack << endl;
+		/*
+		  if ( dist_h_SiPMFront <= dFront )
+		  {
+		  dist_h_SiPMFront = dFront; // cm!!!
+		  }
+		  if ( dist_h_SiPMBack <= dBack )
+		  {
+		  dist_h_SiPMBack = dBack; // cm!!!
+		  }
+		*/
+	}
+	// cout << "First loop on steps ends" << endl;
+	
+	// test factor for calibration coeff. conversion
+	adc_CC_front = 10.0;	
+	adc_CC_back = 10.0;
+	tdc_CC_front = 1.0;	
+	tdc_CC_back = 1.0;
+	
+	double adc_front = 0.00000;
+	double adc_back = 0.00000;
+	double tdc_front = 0.00000;
+	double tdc_back = 0.00000;
+	double time_front = 0.00000;
+	double time_back = 0.00000;
+	double sigma_time = 0.1; // in ns! 100 ps = 0.1 ns
+	
+	///////ALL OF THIS PART WILL NEED TO BE UPDATED WITH ACTUAL CALIBRATION	
+	if ((E_tot_Front > 0.0) || (E_tot_Back > 0.0)) 
+	{
+		double nphe_fr = G4Poisson(E_tot_Front*pmtPEYld);
+		double energy_fr = nphe_fr/pmtPEYld;
+		
+		double nphe_bck = G4Poisson(E_tot_Back*pmtPEYld);
+		double energy_bck = nphe_bck/pmtPEYld;	
+
+		adc_front = energy_fr *adc_CC_front *(1/(dEdxMIP * thickness)); // thickness in X direction
+		adc_back = energy_bck *adc_CC_back *(1/(dEdxMIP * thickness));
+		
+		
+		time_front = EtimesTime_Front/E_tot_Front;
+		time_back = EtimesTime_Back/E_tot_Back;
+		tdc_front = G4RandGauss::shoot(time_front, sigma_time) / tdc_CC_front; 
+		tdc_back = G4RandGauss::shoot(time_back, sigma_time) / tdc_CC_back;
+	}
+		
+	double adc = 0;
+	double time = 0;
+
+	if ( recoil_tof_order == 0 )
+	  {
+	    adc  = adc_front;
+	    time = tdc_front;
+	  }
+	else
+	  {
+	    adc = adc_back;
+	    time = tdc_back;
+	  }
+	
+	dgtz["hitn"]      = hitn;
+	dgtz["sector"]    = recoil_tof_sector; //Sector ranges from 1 to 2                                                           
+	dgtz["row"]     = recoil_tof_row; //Row ranges from 1 to 5
+	dgtz["column"] = recoil_tof_column; //Column ranges from 1 to 63
+	dgtz["TDC_order"] = recoil_tof_order; //order is 0/1 for front(upstream)/back(downstream) 
+	dgtz["TDC_ToT"]   = (int)adc*100;
+	dgtz["TDC_TDC"]  = time * time_to_tdc;
+	
+	// define conditions to reject hit
+	if (rejectHitConditions) {
+		writeHit = false;
+	}
+	
+	return dgtz;
+}
+
+vector<identifier> recoil_tof_HitProcess::processID(vector<identifier> id, G4Step* aStep, detector Detector) {
+	
+	vector<identifier> yid = id;
+		
+	yid[0].id_sharing = 1; // sector
+	yid[1].id_sharing = 1; // row
+	yid[2].id_sharing = 1; // column
+	yid[3].id_sharing = 1; // order
+
+	if (yid[3].id != 0) {
+		cout << "*****WARNING***** in recoil_tof_HitProcess :: processID, order of the original hit should be 0 " << endl;
+		cout << "yid[3].id = " << yid[3].id << endl;
+	}
+	
+	// Now we want to have similar identifiers, but the only difference be id order to be 1, instead of 0
+	identifier this_id = yid[0];
+	yid.push_back(this_id);
+	this_id = yid[1];
+	yid.push_back(this_id);
+	this_id = yid[2];
+	yid.push_back(this_id);
+	this_id = yid[3];
+	this_id.id = 1;
+	yid.push_back(this_id);
+
+	return yid;
+}
+
+// - electronicNoise: returns a vector of hits generated / by electronics.
+
+vector<MHit*> recoil_tof_HitProcess::electronicNoise() {
+	vector<MHit*> noiseHits;
+	
+	// first, identify the cells that would have electronic noise
+	// then instantiate hit with energy E, time T, identifier IDF:
+	//
+	// MHit* thisNoiseHit = new MHit(E, T, IDF, pid);
+	
+	// push to noiseHits collection:
+	// noiseHits.push_back(thisNoiseHit)
+	
+	return noiseHits;
+}
+
+map< string, vector <int> > recoil_tof_HitProcess::multiDgt(MHit* aHit, int hitn) {
+	map< string, vector <int> > MH;
+	
+	return MH;
+}
+
+// - charge: returns charge/time digitized information / step
+
+map< int, vector <double> > recoil_tof_HitProcess::chargeTime(MHit* aHit, int hitn) {
+	map< int, vector <double> >  CT;
+	
+	return CT;
+}
+
+// - voltage: returns a voltage value for a given time. The inputs are:
+// charge value (coming from chargeAtElectronics)
+// time (coming from timeAtElectronics)
+
+double recoil_tof_HitProcess::voltage(double charge, double time, double forTime) {
+	return 0.0;
+}
+
+void recoil_tof_HitProcess::initWithRunNumber(int runno)
+{
+	string digiVariation = gemcOpt.optMap["DIGITIZATION_VARIATION"].args;
+	
+	if (atc.runNo != runno) {
+		cout << " > Initializing " << HCname << " digitization for run number " << runno << endl;
+		atc = initializeRECOILTOFConstants(runno, digiVariation);
+		atc.runNo = runno;
+	}
+}
+
+// this static function will be loaded first thing by the executable
+recoil_tofConstants recoil_tof_HitProcess::atc = initializeRECOILTOFConstants(-1);
+
+
+
+
diff --git a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.h b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.h
new file mode 100644
index 00000000..1bb1797d
--- /dev/null
+++ b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.h
@@ -0,0 +1,68 @@
+#ifndef MYRECOIL_TOF_HITPROCESS_H
+#define MYRECOIL_TOF_HITPROCESS_H 1
+
+// gemc headers
+#include "HitProcess.h"
+
+
+class recoil_tofConstants
+{
+public:
+	
+	// Database parameters
+	int    runNo;
+	string date;
+	string connection;
+	char   database[80];
+	
+	// translation table
+	TranslationTable TT;
+};
+
+
+// Class definition
+/// \class recoil_tof_HitProcess
+/// <b> Recoil Time of Flight Hit Process Routine</b>\n\n
+
+class recoil_tof_HitProcess : public HitProcess
+{
+public:
+	
+	~recoil_tof_HitProcess(){;}
+	
+	// constants initialized with initWithRunNumber
+	static recoil_tofConstants atc;
+	
+	void initWithRunNumber(int runno);
+	
+	// - integrateDgt: returns digitized information integrated over the hit
+	map<string, double> integrateDgt(MHit*, int);
+	
+	// - multiDgt: returns multiple digitized information / hit
+	map< string, vector <int> > multiDgt(MHit*, int);
+	
+	// - charge: returns charge/time digitized information / step
+	virtual map< int, vector <double> > chargeTime(MHit*, int);
+	
+	// - voltage: returns a voltage value for a given time. The input are charge value, time
+	virtual double voltage(double, double, double);
+	
+	// The pure virtual method processID returns a (new) identifier
+	// containing hit sharing information
+	vector<identifier> processID(vector<identifier>, G4Step*, detector);
+	
+	// creates the HitProcess
+	static HitProcess *createHitClass() {return new recoil_tof_HitProcess;}
+	
+	// - electronicNoise: returns a vector of hits generated / by electronics.
+	vector<MHit*> electronicNoise();
+	
+};
+
+
+
+#endif
+
+
+
+
diff --git a/source/output/hipoSchemas.cc b/source/output/hipoSchemas.cc
index 5974e2da..a8904e92 100644
--- a/source/output/hipoSchemas.cc
+++ b/source/output/hipoSchemas.cc
@@ -67,6 +67,7 @@ HipoSchema::HipoSchema() {
     helONLINESchema = hipo::schema("HEL::online", 22000, 13);
     urwellADCSchema = hipo::schema("URWELL::adc", 22300, 11);
     recoilADCSchema   = hipo::schema("RECOIL::adc",  22600, 11);
+    recoiltofTDCSchema = hipo::schema("RECOILTOF::tdc", 22700, 12);
     rawADCSchema = hipo::schema("RAW::adc", 20000, 11);
     rawTDCSchema = hipo::schema("RAW::tdc", 20000, 12);
     rawSCALERSchema = hipo::schema("RAW::scaler", 20000, 13);
@@ -146,6 +147,7 @@ HipoSchema::HipoSchema() {
 
     urwellADCSchema.parse("sector/B, layer/B, component/S, order/B, ADC/I, time/F, ped/S");
     recoilADCSchema.parse(  "sector/B, layer/B, component/S, order/B, ADC/I, time/F, ped/S");
+    recoiltofTDCSchema.parse("sector/B, row/B, column/B, order/B, TDC/I, ToT/I");
 
     rawADCSchema.parse("crate/B, slot/B, channel/S, order/B, ADC/I, time/F, ped/S");
     rawTDCSchema.parse("crate/B, slot/B, channel/S, order/B, TDC/I");
@@ -201,6 +203,7 @@ HipoSchema::HipoSchema() {
     schemasToLoad["RASTER::adc"] = rasterADCSchema;
     schemasToLoad["URWELL::adc"] = urwellADCSchema;
     schemasToLoad["RECOIL::adc"]  = recoilADCSchema;
+    schemasToLoad["RECOILTOF::tdc"]  = recoiltofTDCSchema;
 
     cout << " Done defining Hipo4 schemas." << endl;
 
@@ -241,7 +244,7 @@ bool HipoSchema::non_registered_detectors(string schemaName, int type) {
 
 
     if (type == 0) {  // non adc detectors:
-        if (schemaName == "dc" || schemaName == "rich" || schemaName == "atof") {
+        if (schemaName == "dc" || schemaName == "rich" || schemaName == "atof" || schemaName == "recoil_tof") {
             return false;
         }
     } else if (type == 1) { // non tdc detectors
@@ -252,7 +255,7 @@ bool HipoSchema::non_registered_detectors(string schemaName, int type) {
         if (schemaName == "atof" || schemaName == "band" || schemaName == "bmt" || schemaName == "fmt" || schemaName == "ftm"
             || schemaName == "dc" || schemaName == "bst" || schemaName == "cnd" || schemaName == "ctof" || schemaName == "ecal"
             || schemaName == "ftof" || schemaName == "ft_cal" || schemaName == "ft_hodo" || schemaName == "ft_trk"
-            || schemaName == "htcc" || schemaName == "ltcc" || schemaName == "rich" || schemaName == "rtpc" || schemaName == "urwell" || schemaName == "recoil" || schemaName == "flux") {
+            || schemaName == "htcc" || schemaName == "ltcc" || schemaName == "rich" || schemaName == "rtpc" || schemaName == "urwell" || schemaName == "recoil" || schemaName == "recoil_tof" || schemaName == "flux") {
             return false;
         }
     }
diff --git a/source/output/hipoSchemas.h b/source/output/hipoSchemas.h
index 903806b1..f4b47d7c 100644
--- a/source/output/hipoSchemas.h
+++ b/source/output/hipoSchemas.h
@@ -56,6 +56,7 @@ class HipoSchema {
 	hipo::schema helONLINESchema;
 	hipo::schema urwellADCSchema;
         hipo::schema recoilADCSchema;
+        hipo::schema recoiltofTDCSchema;
 	hipo::schema rasterADCSchema;
 	hipo::schema rawADCSchema;
 	hipo::schema rawTDCSchema;
diff --git a/source/output/hipo_output.h b/source/output/hipo_output.h
index 800506c5..02b95b11 100644
--- a/source/output/hipo_output.h
+++ b/source/output/hipo_output.h
@@ -121,6 +121,7 @@ class hipo_output : public outputFactory
 		{"atof",    24},
 		{"ahdc",    25},
 		{"recoil",  26},
+		{"recoil_tof", 27},
 		{"flux",   100}
 	};
 

From e83f4c015af09380736fda52b1e939dd5f9d8e13 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Thu, 20 Mar 2025 11:53:22 -0400
Subject: [PATCH 04/10] include bank and hit definitions to recoil_tof perl
 script

---
 geometry_source/recoil_tof/recoil_tof.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geometry_source/recoil_tof/recoil_tof.pl b/geometry_source/recoil_tof/recoil_tof.pl
index d73609b0..d79c1acd 100755
--- a/geometry_source/recoil_tof/recoil_tof.pl
+++ b/geometry_source/recoil_tof/recoil_tof.pl
@@ -39,10 +39,10 @@ ()
 require "./materials.pl";
 
 # banks definitions
-#require "./bank.pl";
+require "./bank.pl";
 
 # hits definitions
-#require "./hit.pl";
+require "./hit.pl";
 
 #system("which run-groovy");
 
@@ -58,7 +58,7 @@ ()
 my @allConfs = ("default");
 
 # bank definitions common to all variations
-#define_bank();
+define_banks();
 
 #foreach my $conf ( @allConfs ){
 for(my $ii=0; $ii<=$#allConfs; $ii++){

From 0a4fa6169c1d519f8e06e803d2cf3535c13c7798 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Thu, 20 Mar 2025 15:08:21 -0400
Subject: [PATCH 05/10] add a condition to load schema for recoil_tof

---
 source/output/hipoSchemas.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/output/hipoSchemas.cc b/source/output/hipoSchemas.cc
index a8904e92..7742f121 100644
--- a/source/output/hipoSchemas.cc
+++ b/source/output/hipoSchemas.cc
@@ -231,6 +231,8 @@ hipo::schema HipoSchema::getSchema(string schemaName, int type) {
         return fthodoADCSchema;
     } else if (schemaName == "ft_trk") {
         return ftrkTDCSchema;
+    } else if (schemaName == "recoil_tof") {
+        return recoiltofTDCSchema;
     } else {
         if (non_registered_detectors(schemaName, type)) {
             cout << " SCHEMA " << schemaName << " " << " not found for type " << type << " = " << schemaType << endl;

From 85c29a65ab319fb673604df56439ad022d68b01a Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Fri, 21 Mar 2025 10:43:59 -0400
Subject: [PATCH 06/10] test row and column info in hitprocess function

---
 .../clas12/recoil_tof/recoil_tof_hitprocess.cc   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
index ab353254..2c403cb7 100644
--- a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
+++ b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
@@ -45,7 +45,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	int recoil_tof_row        = identity[1].id; 
 	int recoil_tof_column     = identity[2].id;
 	int recoil_tof_order      = identity[3].id;
-
+	cout << "sector " << recoil_tof_sector << " row "<< recoil_tof_row << " column " << recoil_tof_column << " order " << recoil_tof_order << endl; 
 	double time_to_tdc = 1./0.015625;
 	
 	if(aHit->isBackgroundHit == 1) {
@@ -68,6 +68,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	
 	double length = aHit->GetDetector().dimensions[1]; // half length of bar along y direction
 	double thickness = 2 * aHit->GetDetector().dimensions[2]; // thickness of bar
+	cout << "half length = " << length << " mm " << "thickness = " << thickness << " mm" << endl;
 	
 	vector<G4double>      Edep  = aHit->GetEdep();
 	vector<G4ThreeVector> Lpos  = aHit->GetLPos(); // local position at each step
@@ -92,15 +93,15 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	double E_tot_Front = 0.0;
 	double E_tot_Back = 0.0;
 		
-	double attlength = 160.0; // EJ-204 160 cm
+	double attlength = 1600.0; // here in mm! because all lengths from the volume are in mm!! EJ-204 160 cm
 	double pmtPEYld = 10400.0; // EJ-204 10400 (photons / [1MeV*e-])
 	double dEdxMIP = 1.956; // energy deposited by MIP per cm of scintillator material, to be adapted for SiPM case, it is a function of ?
 	
 	//Variables for tdc calculation (time)
 	double EtimesTime_Front=0.0;
 	double EtimesTime_Back=0.0;
-	double  v_eff_Front = 20.0; // cm/ns! CND v_eff = 16 cm/ns
-	double  v_eff_Back = 20.0;
+	double  v_eff_Front = 200.0; // mm/ns! CND v_eff = 16 cm/ns
+	double  v_eff_Back = 200.0;
 
 	/*
 	double dist_h_SiPMFront =0.0;
@@ -131,7 +132,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 		EtimesTime_Front = EtimesTime_Front + (times[s] + dFront/v_eff_Front)*e_Front;
 		EtimesTime_Back = EtimesTime_Back + (times[s] + dBack/v_eff_Back)*e_Back;
 			
-		//cout << "Distance from hit to Front SIPM, to Back SiPM (mm): " << dFront << ", "<< dBack << endl;
+		cout << "Distance from hit to Front SIPM, to Back SiPM (mm): " << dFront << ", "<< dBack << endl;
 		/*
 		  if ( dist_h_SiPMFront <= dFront )
 		  {
@@ -168,8 +169,8 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 		double nphe_bck = G4Poisson(E_tot_Back*pmtPEYld);
 		double energy_bck = nphe_bck/pmtPEYld;	
 
-		adc_front = energy_fr *adc_CC_front *(1/(dEdxMIP * thickness)); // thickness in X direction
-		adc_back = energy_bck *adc_CC_back *(1/(dEdxMIP * thickness));
+		adc_front = energy_fr *adc_CC_front *(1/(dEdxMIP * thickness * 0.1)); // thickness (mm -> cm) in X direction
+		adc_back = energy_bck *adc_CC_back *(1/(dEdxMIP * thickness * 0.1));
 		
 		
 		time_front = EtimesTime_Front/E_tot_Front;
@@ -191,6 +192,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	    adc = adc_back;
 	    time = tdc_back;
 	  }
+	cout << "sector " << recoil_tof_sector << " row "<< recoil_tof_row << " column " << recoil_tof_column << " order " << recoil_tof_order << endl;
 	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = recoil_tof_sector; //Sector ranges from 1 to 2                                                           

From 2d60b845df6a953208e484c4c11e5d88c68bdf89 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Fri, 21 Mar 2025 11:01:33 -0400
Subject: [PATCH 07/10] include define_hit function

---
 geometry_source/recoil_tof/recoil_tof.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geometry_source/recoil_tof/recoil_tof.pl b/geometry_source/recoil_tof/recoil_tof.pl
index d79c1acd..715a3095 100755
--- a/geometry_source/recoil_tof/recoil_tof.pl
+++ b/geometry_source/recoil_tof/recoil_tof.pl
@@ -75,7 +75,7 @@ ()
 	materials();
 
 	# hits
-        #define_hit();
+        define_hit();
 	
 
 	# sensitive geometry

From ea551f2c484fcfbdd1623f482e131bdb13c5a1f6 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Mon, 24 Mar 2025 13:11:09 -0400
Subject: [PATCH 08/10] Add check for row and column banks for detectorTDCBank

---
 source/output/hipo_output.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/output/hipo_output.cc b/source/output/hipo_output.cc
index 7712a01e..763cbe5c 100644
--- a/source/output/hipo_output.cc
+++ b/source/output/hipo_output.cc
@@ -741,7 +741,7 @@ void hipo_output::writeG4DgtIntegrated(outputContainer *output, vector <hitOutpu
 
                             // sector, layer, component are common in adc/tdc so their names are w/o prefix
                             // sector, layers are "Bytes"
-                            if (bname == "sector" || bname == "layer" || bname == "order") {
+                            if (bname == "sector" || bname == "layer" || bname == "order" || bname == "row" || bname == "column") {
                                 detectorTDCBank.putByte(bname.c_str(), nh, thisVar.second);
                             } else if (bname == "component") {
                                 detectorTDCBank.putShort(bname.c_str(), nh, thisVar.second);

From 765b46968f2b21f902279156d8e7a31f80529188 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Tue, 25 Mar 2025 15:36:46 -0400
Subject: [PATCH 09/10] Use Y position of step to calculate distance to readout

---
 .../clas12/recoil_tof/recoil_tof_hitprocess.cc     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
index 2c403cb7..d46e5cc7 100644
--- a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
+++ b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
@@ -45,7 +45,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	int recoil_tof_row        = identity[1].id; 
 	int recoil_tof_column     = identity[2].id;
 	int recoil_tof_order      = identity[3].id;
-	cout << "sector " << recoil_tof_sector << " row "<< recoil_tof_row << " column " << recoil_tof_column << " order " << recoil_tof_order << endl; 
+	//cout << "sector " << recoil_tof_sector << " row "<< recoil_tof_row << " column " << recoil_tof_column << " order " << recoil_tof_order << endl; 
 	double time_to_tdc = 1./0.015625;
 	
 	if(aHit->isBackgroundHit == 1) {
@@ -68,7 +68,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	
 	double length = aHit->GetDetector().dimensions[1]; // half length of bar along y direction
 	double thickness = 2 * aHit->GetDetector().dimensions[2]; // thickness of bar
-	cout << "half length = " << length << " mm " << "thickness = " << thickness << " mm" << endl;
+	//cout << "half length = " << length << " mm " << "thickness = " << thickness << " mm" << endl;
 	
 	vector<G4double>      Edep  = aHit->GetEdep();
 	vector<G4ThreeVector> Lpos  = aHit->GetLPos(); // local position at each step
@@ -118,8 +118,8 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 		LposY = Lpos[s].y();
 		LposZ = Lpos[s].z();
 		
-		dFront = length - LposZ;
-		dBack = length + LposZ;
+		dFront = length - LposY;
+		dBack = length + LposY;
 		e_Front = Edep[s] *exp(-dFront/attlength); // value for just one step, in MeV!
 		e_Back = Edep[s] *exp(-dBack/attlength);
 		E_tot_Front = E_tot_Front + e_Front; // to sum over all the steps of the hit
@@ -132,7 +132,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 		EtimesTime_Front = EtimesTime_Front + (times[s] + dFront/v_eff_Front)*e_Front;
 		EtimesTime_Back = EtimesTime_Back + (times[s] + dBack/v_eff_Back)*e_Back;
 			
-		cout << "Distance from hit to Front SIPM, to Back SiPM (mm): " << dFront << ", "<< dBack << endl;
+		//cout << "Distance from hit to Front SIPM, to Back SiPM (mm): " << dFront << ", "<< dBack << endl;
 		/*
 		  if ( dist_h_SiPMFront <= dFront )
 		  {
@@ -169,7 +169,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 		double nphe_bck = G4Poisson(E_tot_Back*pmtPEYld);
 		double energy_bck = nphe_bck/pmtPEYld;	
 
-		adc_front = energy_fr *adc_CC_front *(1/(dEdxMIP * thickness * 0.1)); // thickness (mm -> cm) in X direction
+		adc_front = energy_fr *adc_CC_front *(1/(dEdxMIP * thickness * 0.1)); // thickness of bar (mm -> cm) 
 		adc_back = energy_bck *adc_CC_back *(1/(dEdxMIP * thickness * 0.1));
 		
 		
@@ -192,7 +192,7 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	    adc = adc_back;
 	    time = tdc_back;
 	  }
-	cout << "sector " << recoil_tof_sector << " row "<< recoil_tof_row << " column " << recoil_tof_column << " order " << recoil_tof_order << endl;
+
 	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = recoil_tof_sector; //Sector ranges from 1 to 2                                                           

From b40e7c3a314ee8b771745d5a01a082d29b9c4529 Mon Sep 17 00:00:00 2001
From: niwgit <wnilanga@yahoo.com>
Date: Fri, 28 Mar 2025 09:56:34 -0400
Subject: [PATCH 10/10] Use 50 ps time resolution for shorter bars

---
 source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
index d46e5cc7..976d36db 100644
--- a/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
+++ b/source/hitprocess/clas12/recoil_tof/recoil_tof_hitprocess.cc
@@ -158,7 +158,10 @@ map<string, double> recoil_tof_HitProcess::integrateDgt(MHit* aHit, int hitn) {
 	double tdc_back = 0.00000;
 	double time_front = 0.00000;
 	double time_back = 0.00000;
-	double sigma_time = 0.1; // in ns! 100 ps = 0.1 ns
+	double sigma_time = 0.00000; // in ns! 100 ps = 0.1 ns
+
+	if(recoil_tof_row == 3) sigma_time = 0.05; // better time resolution for shorter bars
+	else sigma_time = 0.1;
 	
 	///////ALL OF THIS PART WILL NEED TO BE UPDATED WITH ACTUAL CALIBRATION	
 	if ((E_tot_Front > 0.0) || (E_tot_Back > 0.0))