fadc time now includes 16 picoseconds precision

maureeungaro · maureeungaro · commit 5ade82fec5a8 · 2023-05-01T15:49:44.000-04:00
diff --git a/hitprocess/clas12/cnd_hitprocess.cc b/hitprocess/clas12/cnd_hitprocess.cc
@@ -574,15 +574,15 @@ map<string, double> cnd_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 
 	}
 
-
+	int fadc_time = convert_to_precision(TDC*slope);
 	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = sector;
 	dgtz["layer"]     = layer;
 	dgtz["component"] = 1;
 	dgtz["ADC_order"] = adc_order ; // 0 = left 1 = right
 	dgtz["ADC_ADC"]   = ADC;
-	dgtz["ADC_time"]  = TDC;   // no conversion
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	dgtz["TDC_order"] = adc_order + 2; // 2 = left 3 = right
 	dgtz["TDC_TDC"]   = TDC;
diff --git a/hitprocess/clas12/cnd_hitprocess.h b/hitprocess/clas12/cnd_hitprocess.h
@@ -99,11 +99,19 @@ class cnd_HitProcess : public HitProcess
 	
 	double BirksAttenuation(double,double,int,double);
 	
+	
+
 private:
 	
 	
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
+	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
 };
 
 #endif
diff --git a/hitprocess/clas12/ctof_hitprocess.cc b/hitprocess/clas12/ctof_hitprocess.cc
@@ -387,13 +387,16 @@ map<string, double> ctof_HitProcess::integrateDgt(MHit* aHit, int hitn)
 		}
 	}
 	
+	int fadc_time = convert_to_precision(tdc*tdcconv);
+
+	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = 1;
 	dgtz["layer"]     = 1;
 	dgtz["component"] = paddle;
 	dgtz["ADC_order"] = side;
 	dgtz["ADC_ADC"]   = (int) adc;
-	dgtz["ADC_time"]  = (tdc*tdcconv);
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	
 	dgtz["TDC_order"] = side + 2;
diff --git a/hitprocess/clas12/ctof_hitprocess.h b/hitprocess/clas12/ctof_hitprocess.h
@@ -129,6 +129,10 @@ class ctof_HitProcess : public HitProcess
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
 	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
 	
 };
 
diff --git a/hitprocess/clas12/ecal_hitprocess.cc b/hitprocess/clas12/ecal_hitprocess.cc
@@ -313,13 +313,15 @@ map<string, double> ecal_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 	
 	float tdc2ns = 0.02345f;
 	
+	int fadc_time = convert_to_precision(tdc2ns*TDC/a1);
+	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = sector;
 	dgtz["layer"]     = layer;
 	dgtz["component"] = strip;
 	dgtz["ADC_order"] = 0;
 	dgtz["ADC_ADC"]   = ADC;
-	dgtz["ADC_time"]  = tdc2ns*TDC/a1;
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	dgtz["TDC_order"] = 2;
 	dgtz["TDC_TDC"]   = TDC/a1;
diff --git a/hitprocess/clas12/ecal_hitprocess.h b/hitprocess/clas12/ecal_hitprocess.h
@@ -96,6 +96,15 @@ class ecal_HitProcess : public HitProcess
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
 	
+private:
+	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
+
+	
 };
 
 #endif
diff --git a/hitprocess/clas12/ft_cal_hitprocess.cc b/hitprocess/clas12/ft_cal_hitprocess.cc
@@ -264,13 +264,15 @@ map<string, double> ft_cal_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 		}
 	}
 	
+	int fadc_time = convert_to_precision(TDC/25);
+	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = 1;
 	dgtz["layer"]     = 1;
 	dgtz["component"] = iCrystal;
 	dgtz["ADC_order"] = 0;
 	dgtz["ADC_ADC"]   = ADC;
-	dgtz["ADC_time"]  = (int) TDC/25;
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	
 	
diff --git a/hitprocess/clas12/ft_cal_hitprocess.h b/hitprocess/clas12/ft_cal_hitprocess.h
@@ -104,6 +104,12 @@ class ft_cal_HitProcess : public HitProcess
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
 	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
+
 };
 
 #endif
diff --git a/hitprocess/clas12/ft_hodo_hitprocess.cc b/hitprocess/clas12/ft_hodo_hitprocess.cc
@@ -211,13 +211,17 @@ map<string, double> ft_hodo_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 				<< icomponent << endl;
 		}
 	}
+	
+	int fadc_time = convert_to_precision(TDC/25);
+
+	
 	dgtz["hitn"]      = hitn;
 	dgtz["sector"]    = isector;
 	dgtz["layer"]     = ilayer;
 	dgtz["component"] = icomponent;
 	dgtz["ADC_order"] = 0;
 	dgtz["ADC_ADC"]   = ADC;
-	dgtz["ADC_time"]  = TDC/25;
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	
 	// define conditions to reject hit
diff --git a/hitprocess/clas12/ft_hodo_hitprocess.h b/hitprocess/clas12/ft_hodo_hitprocess.h
@@ -96,6 +96,12 @@ class ft_hodo_HitProcess : public HitProcess
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
 	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
+
 };
 
 #endif
diff --git a/hitprocess/clas12/ftof_hitprocess.h b/hitprocess/clas12/ftof_hitprocess.h
@@ -119,7 +119,16 @@ class ftof_HitProcess : public HitProcess
 	
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
+
+	
+private:
+
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
 	
+
 };
 
 
diff --git a/hitprocess/clas12/htcc_hitprocess.cc b/hitprocess/clas12/htcc_hitprocess.cc
@@ -289,6 +289,9 @@ map<string, double> htcc_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 	
 	double adc  = 100 * G4RandGauss::shoot(ndetected*htccc.mc_gain[idsector-1][idhalf-1][idring-1], ndetected*htccc.mc_smear[idsector-1][idhalf-1][idring-1]);
 	double time = tInfos.time + htccc.tshift[idsector-1][idhalf-1][idring-1];
+
+	int fadc_time = convert_to_precision(time);
+
 	
 	dgtz["hitn"]   = hitn;
 	
@@ -297,7 +300,7 @@ map<string, double> htcc_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 	dgtz["component"] = idring;
 	dgtz["ADC_order"] = 0;
 	dgtz["ADC_ADC"]   = (int) adc;
-	dgtz["ADC_time"]  = time;
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	
 	dgtz["TDC_order"] = 0;
diff --git a/hitprocess/clas12/htcc_hitprocess.h b/hitprocess/clas12/htcc_hitprocess.h
@@ -92,6 +92,12 @@ class htcc_HitProcess : public HitProcess
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
 	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
+
 };
 
 #endif
diff --git a/hitprocess/clas12/ltcc_hitprocess.cc b/hitprocess/clas12/ltcc_hitprocess.cc
@@ -186,14 +186,17 @@ map<string, double> ltcc_HitProcess :: integrateDgt(MHit* aHit, int hitn)
 	double timeOffset = G4RandGauss::shoot(ltccc.timeOffset[idsector-1][idside-1][idsegment-1], ltccc.timeRes[idsector-1][idside-1][idsegment-1]);
 	double time = tInfos.time + timeOffset;
 	
+	int fadc_time = convert_to_precision(time);
+
+	
 	dgtz["hitn"]   = hitn;
 	
 	dgtz["sector"]    = idsector;
 	dgtz["layer"]     = idside;
 	dgtz["component"] = idsegment;
 	dgtz["ADC_order"] = 0;
 	dgtz["ADC_ADC"]   = adc;
-	dgtz["ADC_time"]  = time;
+	dgtz["ADC_time"]  = fadc_time;
 	dgtz["ADC_ped"]   = 0;
 	
 	dgtz["TDC_order"] = 0;
diff --git a/hitprocess/clas12/ltcc_hitprocess.h b/hitprocess/clas12/ltcc_hitprocess.h
@@ -62,6 +62,13 @@ class ltcc_HitProcess : public HitProcess
 	
 	// - electronicNoise: returns a vector of hits generated / by electronics.
 	vector<MHit*> electronicNoise();
+	
+	double fadc_precision = 0.0625;  // 16 picoseconds resolution
+	int convert_to_precision(double tdc) {
+		return (int( tdc / fadc_precision ) / fadc_precision);
+	}
+	
+
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -264,13 +264,15 @@ map<string, double> ft_cal_HitProcess :: integrateDgt(MHit* aHit, int hitn)`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
	`267`	`+ int fadc_time = convert_to_precision(TDC/25);`
	`268`	`+`
`267`	`269`	`dgtz["hitn"] = hitn;`
`268`	`270`	`dgtz["sector"] = 1;`
`269`	`271`	`dgtz["layer"] = 1;`
`270`	`272`	`dgtz["component"] = iCrystal;`
`271`	`273`	`dgtz["ADC_order"] = 0;`
`272`	`274`	`dgtz["ADC_ADC"] = ADC;`
`273`		`- dgtz["ADC_time"] = (int) TDC/25;`
	`275`	`+ dgtz["ADC_time"] = fadc_time;`
`274`	`276`	`dgtz["ADC_ped"] = 0;`
`275`	`277`
`276`	`278`