update

TTU-HEP · Nov 6, 2024 · ce8d335 · ce8d335
1 parent 5000974
commit ce8d335
Show file tree

Hide file tree

Showing 19 changed files with 96 additions and 2,270 deletions.
diff --git a/jobs/jobSubmission.py b/jobs/jobSubmission.py
@@ -8,7 +8,9 @@
 """
 
 singularity_cmd = "singularity run --cleanenv --bind /lustre:/lustre /lustre/work/yofeng/SimulationEnv/alma9forgeant4_sbox/"
-run_cmd = "BUILDDIR/exampleB4b -b BUILDDIR/paramBatch03_single.mac      -jobName JOBNAME -runNumber RUNNUM -runSeq RUNSEQ      -numberOfEvents NEVENTS  -eventsInNtupe NEVENTS -gun_particle PARTICLE -gun_energy_min ENERGY_MIN -gun_energy_max ENERGY_MAX     -sipmType 1"
+#run_cmd = "BUILDDIR/exampleB4b -b BUILDDIR/paramBatch03_single.mac      -jobName JOBNAME -runNumber RUNNUM -runSeq RUNSEQ      -numberOfEvents NEVENTS  -eventsInNtupe NEVENTS -gun_particle PARTICLE -gun_energy_min ENERGY_MIN -gun_energy_max ENERGY_MAX     -sipmType 1"
+run_cmd = "BUILDDIR/exampleB4b -b BUILDDIR/paramBatch03_single_photon.mac      -jobName JOBNAME -runNumber RUNNUM -runSeq RUNSEQ      -numberOfEvents NEVENTS  -eventsInNtupe NEVENTS -gun_particle PARTICLE -sipmType 1"
+run_cmd = "BUILDDIR/exampleB4b -b BUILDDIR/paramBatch03_single_ele.mac      -jobName JOBNAME -runNumber RUNNUM -runSeq RUNSEQ      -numberOfEvents NEVENTS  -eventsInNtupe NEVENTS -gun_particle PARTICLE -gun_energy_min ENERGY_MIN -gun_energy_max ENERGY_MAX -sipmType 1"
 
 import os
 
@@ -18,12 +20,12 @@
 #
 # change from here
 #
-sim_build_dir = f"{current_dir}/../sim/build"
+sim_build_dir = f"{current_dir}/../opticssim/build"
 log_dir = f"{current_dir}/log"
-njobs = 50
-nevents_per_job = 20
+njobs = 100
+nevents_per_job = 50
 runnumber = 100
-particle = "e+"
+particle = "pi+"
 energy_min = 100
 energy_max = 101
 jobname_prefix = "dreamsim"

diff --git a/opticssim/src/B4DetectorConstruction.cc b/opticssim/src/B4DetectorConstruction.cc
@@ -460,19 +460,19 @@ G4VPhysicalVolume *B4DetectorConstruction::DefineVolumes()
     G4LogicalVolume *fiberCoreSLog = new G4LogicalVolume(fiberS, core_S_Material, "fiberCoreS");
 
     new G4PVPlacement(0, G4ThreeVector(0, 0, 0), fiberCoreCLog, "fiberCoreCherePhys", fiberCLog, false, 0, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(0, 0, 0), fiberCoreSLog, "fiberCoreScintPhys", fiberSLog, false, 0, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(0, 0, 0), fiberCoreSLog, "fiberCoreScintPhys", fiberSLog, false, 0, fCheckOverlaps);
 
     double R = clad_C_rMax * 2.0 + 0.01; // 10 micron gap between cenral and peripheral fibers
     double cx1 = R * cos(30.0 * deg);
     double cy1 = R * sin(30.0 * deg);
     new G4PVPlacement(0, G4ThreeVector(0., 0., 0.), fiberCLog, "fiberCladC", holeLV, false, 0, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(cx1, cy1, 0.0), fiberCLog, "fiberCladC", holeLV, false, 1, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(-cx1, cy1, 0.0), fiberCLog, "fiberCladC", holeLV, false, 2, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(0., -R, 0.), fiberCLog, "fiberCladC", holeLV, false, 3, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(cx1, cy1, 0.0), fiberCLog, "fiberCladC", holeLV, false, 1, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(-cx1, cy1, 0.0), fiberCLog, "fiberCladC", holeLV, false, 2, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(0., -R, 0.), fiberCLog, "fiberCladC", holeLV, false, 3, fCheckOverlaps);
 
-    new G4PVPlacement(0, G4ThreeVector(cx1, -cy1, 0.), fiberSLog, "fiberCladS", holeLV, false, 1, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(0.0, R, 0.), fiberSLog, "fiberCladS", holeLV, false, 2, fCheckOverlaps);
-    new G4PVPlacement(0, G4ThreeVector(-cx1, -cy1, 0.), fiberSLog, "fiberCladS", holeLV, false, 3, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(cx1, -cy1, 0.), fiberSLog, "fiberCladS", holeLV, false, 1, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(0.0, R, 0.), fiberSLog, "fiberCladS", holeLV, false, 2, fCheckOverlaps);
+    // new G4PVPlacement(0, G4ThreeVector(-cx1, -cy1, 0.), fiberSLog, "fiberCladS", holeLV, false, 3, fCheckOverlaps);
 
     /*if(sd){
      fiberCoreCLog->SetSensitiveDetector(sd);

diff --git a/plotter/analyzePKL01.ipynb b/plotter/analyzePKL01.ipynb
diff --git a/plotter/hgdream-3d-06.ipynb b/plotter/hgdream-3d-06.ipynb
diff --git a/plotter/hgdream-3d-06a.ipynb b/plotter/hgdream-3d-06a.ipynb
diff --git a/plotter/hgdream3dAnalysis.root b/plotter/hgdream3dAnalysis.root
diff --git a/plotter/inputs/optics/electrons.txt b/plotter/inputs/optics/electrons.txt
@@ -1 +1 @@
-/home/yfeng/Desktop/TTU/CaloX/Dream/Sim/dream2.06/opticssim/build/mc_testjob_run001_003_Test_10evt_e+_10.0_10.0.root
+/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_e+_26_run100_26_Test_50evt_e+_100_101.root
diff --git a/plotter/inputs/optics/ops.txt b/plotter/inputs/optics/ops.txt
@@ -0,0 +1,4 @@
+/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_opticalphoton_23_run100_23_Test_500000evt_opticalphoton_0.000001_0.000001.root
+/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_opticalphoton_81_run100_81_Test_500000evt_opticalphoton_0.000001_0.000001.root
+/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_opticalphoton_86_run100_86_Test_500000evt_opticalphoton_0.000001_0.000001.root
+/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_opticalphoton_94_run100_94_Test_500000evt_opticalphoton_0.000001_0.000001.root
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/yfeng/Desktop/TTU/CaloX/Dream/Sim/dream2.06/opticssim/build/mc_testjob_run001_003_Test_10evt_e+_10.0_10.0.root
		/home/yofeng/CaloX/DREAMSim/jobs/mc_dreamsim_e+_26_run100_26_Test_50evt_e+_100_101.root