Included a 100kton with 15% HQE coverage option. I also updated the vis and novis macro files. The novis.mac file was a bit out of date. I went ahead and made the new option the default since it runs a bit faster, this can be easily changed if anyone has a strong opinion.

Author: John Felde

include/WCSimDetectorConstruction.hh

@@ -58,6 +58,7 @@ public:
   // Related to the WC geometry
   void SetSuperKGeometry();
   void DUSEL_100kton_10inch_40perCent();
+  void DUSEL_100kton_10inch_HQE_15perCent();
   void DUSEL_100kton_10inch_HQE_30perCent();
   void DUSEL_100kton_10inch_HQE_30perCent_Gd();
   void DUSEL_150kton_10inch_HQE_30perCent();

novis.mac

@@ -4,6 +4,29 @@
 /tracking/verbose 0
 /hits/verbose 0
 
+## select the geometry
+# Default config if you do nothing is currently DUSEL100KT
+#
+# The tube size is fixed for SK to 20"
+# These are fixed geometries for validation
+#/WCSim/WCgeom SuperK
+# Currently by defualt the DUSEL configurations are 10 inch.
+# you can overide this with the WCPMTsize command.
+# The mailbox will still give errors as of 8/28/09 (CWW)
+# WCPMTsize command commented out on 10/1/09 (CWW)
+#
+#/WCSim/WCgeom DUSEL_100kton_10inch_40perCent
+#/WCSim/WCgeom DUSEL_100kton_10inch_HQE_15perCent
+#/WCSim/WCgeom DUSEL_100kton_10inch_HQE_30perCent
+#/WCSim/WCgeom DUSEL_100kton_10inch_HQE_30perCent_Gd
+#/WCSim/WCgeom DUSEL_150kton_10inch_HQE_30perCent
+#/WCSim/WCgeom 150kTMailbox_10inch_HQE_30perCent
+#/WCSim/WCgeom 150kTMailbox_10inch_40perCent
+#/WCSim/Construct
+
+# command to choose save or not save the pi0 info 07/03/10 (XQ)
+/WCSim/SavePi0 false
+
 ## select the input nuance-formatted vector file
 ## you can of course use your own
 #/mygen/vecfile inputvectorfile
@@ -12,31 +35,14 @@
 
 # Or you can use the G4 Particle Gun
 /mygen/generator normal
-/gun/particle mu-
+/gun/particle e-
 #/gun/particle pi0
-/gun/energy 5000 MeV
+/gun/energy 1000 MeV
 /gun/direction 1 0 0 
 /gun/position 1 0 0 
 
 ## change the name of the output root file, default = wcsim.root
 /WCSimIO/RootFile wcsim.root
 
-## select the geometry
-# Default config if you do nothing is currently DUSEL100KT
-#
-# The tube size is fixed for SK and 1kton to 20"
-# These are fixed geometries for validation
-#/WCSim/WCgeom SuperK
-# Currently by defualt the DUSEL configurations are 10 inch.
-# you can overide this with the WCPMTsize command.
-# The mailbox will still give errors as of 8/28/09 (CWW)
-# WCPMTsize command commented out on 10/1/09 (CWW)
-#
-#/WCSim/WCgeom DUSEL100KT
-#/WCSim/WCgeom DUSEL150KT
-#/WCSim/WCgeom 300KTMailbox
-#/WCSim/WCPMTsize 20inch
-#/WCSim/Construct
-
-/run/beamOn 50
+/run/beamOn 1
 #exit

src/WCSimConstructWC.cc

@@ -75,6 +75,29 @@ void WCSimDetectorConstruction::DUSEL_100kton_10inch_40perCent()
   WCAddGd               = false;
 }
 
+void WCSimDetectorConstruction::DUSEL_100kton_10inch_HQE_15perCent()
+{
+  WCPMTName             = "10inchHQE";
+  WCPMTRadius           = .127*m;
+  WCPMTExposeHeight	    = WCPMTRadius - 0.01*m;
+  WCIDDiameter          = 53.0*m;
+  WCIDHeight            = 60.0*m;
+  WCBarrelPMTOffset	    = WCPMTRadius;
+  WCPMTperCellHorizontal = 4.0;
+  WCPMTperCellVertical	 = 3.0;
+  WCPMTPercentCoverage	 = 15.0;
+  WCBarrelNumPMTHorizontal = round(WCIDDiameter*sqrt(pi*WCPMTPercentCoverage)/
+                                    (10.0*WCPMTRadius));
+  WCBarrelNRings        = round(((WCBarrelNumPMTHorizontal*((WCIDHeight-
+                                    2*WCBarrelPMTOffset)/(pi*WCIDDiameter)))/
+                                    WCPMTperCellVertical));
+  WCCapPMTSpacing       = (pi*WCIDDiameter/WCBarrelNumPMTHorizontal);
+  WCCapEdgeLimit        = WCIDDiameter/2.0 - WCPMTRadius;
+  WCPMTGlassThickness   = .55*cm;
+  WCBlackSheetThickness = 2.0*cm;
+  WCAddGd               = false;
+}
+
 void WCSimDetectorConstruction::DUSEL_100kton_10inch_HQE_30perCent()
 {
   WCPMTName             = "10inchHQE";

src/WCSimDetectorConstruction.cc

@@ -58,7 +58,8 @@ WCSimDetectorConstruction::WCSimDetectorConstruction(G4int DetConfig,WCSimTuning
   //-----------------------------------------------------
 
   //SetSuperKGeometry();
-  DUSEL_100kton_10inch_40perCent();
+  //DUSEL_100kton_10inch_40perCent();
+  DUSEL_100kton_10inch_HQE_15perCent();
   //DUSEL_100kton_10inch_HQE_30perCent();
   //DUSEL_100kton_10inch_HQE_30perCent_Gd();
   //DUSEL_150kton_10inch_HQE_30perCent();

src/WCSimDetectorMessenger.cc

@@ -18,6 +18,7 @@ WCSimDetectorMessenger::WCSimDetectorMessenger(WCSimDetectorConstruction* WCSimD
   PMTConfig->SetGuidance("Available options are:\n"
                           "SuperK\n"
                           "DUSEL_100kton_10inch_40perCent\n"
+                          "DUSEL_100kton_10inch_HQE_15perCent\n"
                           "DUSEL_100kton_10inch_HQE_30perCent\n"
                           "DUSEL_100kton_10inch_HQE_30perCent_Gd\n"
                           "DUSEL_150kton_10inch_HQE_30perCent\n"
@@ -26,6 +27,7 @@ WCSimDetectorMessenger::WCSimDetectorMessenger(WCSimDetectorConstruction* WCSimD
   PMTConfig->SetParameterName("PMTConfig", false);
   PMTConfig->SetCandidates("SuperK "
                           "DUSEL_100kton_10inch_40perCent "
+                          "DUSEL_100kton_10inch_15perCent "
                           "DUSEL_100kton_10inch_HQE_30perCent "
                           "DUSEL_100kton_10inch_HQE_30perCent_Gd "
                           "DUSEL_150kton_10inch_HQE_30perCent "
@@ -74,6 +76,8 @@ void WCSimDetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
 			WCSimDetector->SetSuperKGeometry();
 		} else if(newValue == "DUSEL_100kton_10inch_40perCent") {
 			WCSimDetector->DUSEL_100kton_10inch_40perCent();
+        } else if(newValue == "DUSEL_100kton_10inch_HQE_15perCent"){
+            WCSimDetector->DUSEL_100kton_10inch_HQE_15perCent();
 		} else if(newValue == "DUSEL_100kton_10inch_HQE_30perCent") {
 			WCSimDetector->DUSEL_100kton_10inch_HQE_30perCent();
 		} else if(newValue == "DUSEL_100kton_10inch_HQE_30perCent_Gd") {

vis.mac

@@ -16,13 +16,14 @@
 # The mailbox will still give errors as of 8/28/09 (CWW)
 # WCPMTsize command commented out on 10/1/09 (CWW)
 #
-/WCSim/WCgeom DUSEL_100kton_10inch_40perCent
+#/WCSim/WCgeom DUSEL_100kton_10inch_40perCent
+#/WCSim/WCgeom DUSEL_100kton_10inch_HQE_15perCent
 #/WCSim/WCgeom DUSEL_100kton_10inch_HQE_30perCent
 #/WCSim/WCgeom DUSEL_100kton_10inch_HQE_30perCent_Gd
 #/WCSim/WCgeom DUSEL_150kton_10inch_HQE_30perCent
 #/WCSim/WCgeom 150kTMailbox_10inch_HQE_30perCent
 #/WCSim/WCgeom 150kTMailbox_10inch_40perCent
-/WCSim/Construct
+#/WCSim/Construct
 
 # command to choose save or not save the pi0 info 07/03/10 (XQ)
 /WCSim/SavePi0 false