diff --git a/setupenvsfnal b/setupenvsfnal
index 94ee2c624..5992da61c 100644
--- a/setupenvsfnal
+++ b/setupenvsfnal
@@ -6,7 +6,10 @@ setup_annie_g410()
 
   source /grid/fermiapp/products/common/etc/setup
 
-  export PRODUCTS=${PRODUCTS}:/grid/fermiapp/products/larsoft
+  #export PRODUCTS=${PRODUCTS}:/grid/fermiapp/products/larsoft
+  export PRODUCTS=${PRODUCTS}:/grid/fermiapp/products/larsoft:/cvmfs/fermilab.opensciencegrid.org/products
+
+  source /cvmfs/fermilab.opensciencegrid.org/products/common/etc/setup
 
 #  setup genie v2_8_6d -q e9:debug
 
@@ -14,14 +17,17 @@ setup_annie_g410()
 
 #  setup genie_phyopt v2_8_6 -q dkcharmtau
 
-  setup geant4 v4_10_1_p02a -q e9:debug:qt
-
+  #setup geant4 v4_10_1_p02a -q e9:debug:qt
+ # setup geant4 v4_10_1_p02a
+  setup geant4         v4_10_1_p03a -q debug:e10:qt
 }
 
 # type at the command line (but NOT in .bashrc!)
 setup_annie_g410
 
-setup cmake	#sets up 2_8_8 
+setup cmake        v3_0_1
+
+#setup cmake	#sets up 2_8_8 
 #setup -f Linux64bit+2.6-2.12 cmake v3_6_2a	# sets compiler to gcc 4.4! doesn't support c++14... 
 
 #setup -f Linux64bit+2.6-2.12 -q debug:e9:nu root v6_04_06
@@ -32,7 +38,8 @@ source /grid/fermiapp/products/larsoft/root/v6_06_08/Linux64bit+2.6-2.12-e10-nu-
 setup -f Linux64bit+2.6-2.12 -q debug:e10:r6 genie v2_12_0a
 
 #overwrite the clhep setup set by genie
-setup -f Linux64bit+2.6-2.12 -q debug:e9 clhep v2_2_0_8
+#setup -f Linux64bit+2.6-2.12 -q debug:e9 clhep v2_2_0_8
+setup clhep        v2_3_2_2 -q debug:e10
 
 setup -f Linux64bit+2.6-2.12 -q debug:e10 xerces_c v3_1_3
 export XERCESROOT=/grid/fermiapp/products/larsoft/xerces_c/v3_1_3/Linux64bit+2.6-2.12-e10-debug
@@ -43,7 +50,15 @@ export G4SYSTEM=Linux-g++
 #export ROOT_PATH=/grid/fermiapp/products/larsoft/root/v6_04_06/source/root-6.04.06/etc/cmake
 export ROOT_PATH=/grid/fermiapp/products/larsoft/root/v6_06_08/Linux64bit+2.6-2.12-e10-nu-debug/cmake
 
-export GEANT4_PATH=/grid/fermiapp/products/larsoft/geant4/v4_10_1_p02a/Linux64bit+2.6-2.12-e9-qt-debug/lib64/Geant4-10.1.2
+#export GEANT4_PATH=/grid/fermiapp/products/larsoft/geant4/v4_10_1_p02a/Linux64bit+2.6-2.12-e9-qt-debug/lib64/Geant4-10.1.2
+
+#export GEANT4_MAKEFULL_PATH=/grid/fermiapp/products/larsoft/geant4/v4_10_1_p02a/source/geant4.10.01.p02
+
+export GEANT4_PATH=/cvmfs/larsoft.opensciencegrid.org/products/geant4/v4_10_1_p03a/Linux64bit+2.6-2.12-e10-qt-debug/lib64/Geant4-10.1.3
+export GEANT4_MAKEFULL_PATH=/cvmfs/larsoft.opensciencegrid.org/products/geant4/v4_10_1_p03a/source/geant4.10.01.p03
 
-export GEANT4_MAKEFULL_PATH=/grid/fermiapp/products/larsoft/geant4/v4_10_1_p02a/source/geant4.10.01.p02
+export LIBRARY_PATH=${LIBRARY_PATH}:/cvmfs/annie.opensciencegrid.org/products/toolanalysis/v0_0_0/extras_for_oasis_build
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/cvmfs/annie.opensciencegrid.org/products/toolanalysis/v0_0_0/extras_for_oasis_build
 
+#export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/cvmfs/larsoft.opensciencegrid.org/products/qt/v5_10_1a/Linux64bit+2.6-2.12-e15/
+export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/cvmfs/larsoft.opensciencegrid.org/products/qt/v5_4_2a/Linux64bit+2.6-2.12-e9/
diff --git a/src/ConstructANNIE.cc b/src/ConstructANNIE.cc
index 92bff39fd..69a5751b5 100644
--- a/src/ConstructANNIE.cc
+++ b/src/ConstructANNIE.cc
@@ -188,7 +188,7 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIE()
 		//                 General Tank Construction
 		//============================================================
 		if(WCDetectorName=="ANNIEp2v6") waterTank_log = ConstructANNIECylinder();
-		else if(WCDetectorName="ANNIEp2v7") waterTank_log = ConstructANNIECylinderScan();
+		else if(WCDetectorName=="ANNIEp2v7") waterTank_log = ConstructANNIECylinderScan();
 		else  waterTank_log = ConstructCylinder();
 		//rotm->rotateZ(22.5*deg);
 		G4cout << "Putting tank at y_offset = "<<-tankyoffset<<", z_offset = "<<tankouterRadius+tankzoffset<<G4endl;
diff --git a/src/WCSimConstructANNIECylinderScan.cc b/src/WCSimConstructANNIECylinderScan.cc
index 86135daaf..a41e1b0cc 100644
--- a/src/WCSimConstructANNIECylinderScan.cc
+++ b/src/WCSimConstructANNIECylinderScan.cc
@@ -134,10 +134,12 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 	// and also some other volumes to make the edges light tight
 	//-----------------------------------------------------------
 	
-	G4double annulusBlackSheetRmax[2] = {(WCIDRadius+WCBlackSheetThickness),
-										  WCIDRadius+WCBlackSheetThickness};
-	G4double annulusBlackSheetRmin[2] = {(WCIDRadius),
-										  WCIDRadius};
+	G4double BlackSheetRadius = WCIDRadius + 3*cm;
+
+	G4double annulusBlackSheetRmax[2] = {(BlackSheetRadius+WCBlackSheetThickness),
+										  BlackSheetRadius+WCBlackSheetThickness};
+	G4double annulusBlackSheetRmin[2] = {(BlackSheetRadius),
+										  BlackSheetRadius};
 	mainAnnulusHeight = WCIDHeight -2.*WCBarrelPMTOffset;
 	mainAnnulusHeight += 30*cm;	//WCBlackSheet needs to extend to above ETEL holders and below LUX housings to match reality
 	G4double mainAnnulusZ[2] = {-mainAnnulusHeight/2., mainAnnulusHeight/2};
@@ -166,7 +168,7 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 						  false,
 						  0,true);
 	G4cout<<"Constructed barrel cell blacksheet with radius "<<WCIDRadius<<" to "<<(WCIDRadius+WCBlackSheetThickness)<<G4endl;
-	WCCylInfo[2]=WCIDRadius/10.;
+	WCCylInfo[2]=BlackSheetRadius/10.;
 	
 	G4LogicalBorderSurface * WaterBSBarrelCellSurface 
 		= new G4LogicalBorderSurface("WaterBSBarrelCellSurface",
@@ -357,10 +359,12 @@ void WCSimDetectorConstruction::ConstructANNIECapsSheet(G4int zflip)
 	// ---------------------Add cap blacksheet----------------------------
 	// -------------------------------------------------------------------
 	
+	G4double BlackSheetRadius = WCIDRadius + 3*cm;
+
 	G4double capBlackSheetZ[2] = {-WCBlackSheetThickness*zflip, 0.};
 	G4double capBlackSheetRmin[2] = {0., 0.};
-	G4double capBlackSheetRmax[2] = {WCIDRadius+WCBlackSheetThickness, 
-									 WCIDRadius+WCBlackSheetThickness};
+	G4double capBlackSheetRmax[2] = {BlackSheetRadius+WCBlackSheetThickness, 
+									 BlackSheetRadius+WCBlackSheetThickness};
 	G4VSolid* solidWCCapBlackSheet;
 	if(WCBarrelRingNPhi*WCPMTperCellHorizontal == WCBarrelNumPMTHorizontal){
 		solidWCCapBlackSheet
diff --git a/src/WCSimDetectorConstruction.cc b/src/WCSimDetectorConstruction.cc
index cdac3ec39..e79439a93 100644
--- a/src/WCSimDetectorConstruction.cc
+++ b/src/WCSimDetectorConstruction.cc
@@ -102,7 +102,7 @@ WCSimDetectorConstruction::WCSimDetectorConstruction(G4int DetConfig,WCSimTuning
   //-----------------------------------------------------
   SetPMT_QE_Method(1);
 
-   //default is to use collection efficiency
+  //default is to use collection efficiency
   SetPMT_Coll_Eff(1);
   SetLAPPD_QE_Method(1);
   SetLAPPD_Coll_Eff(1);
diff --git a/src/WCSimPMTObject.cc b/src/WCSimPMTObject.cc
index 354d28059..c7ed8d3df 100644
--- a/src/WCSimPMTObject.cc
+++ b/src/WCSimPMTObject.cc
@@ -2153,6 +2153,8 @@ G4float PMT_R5912HQE::HitTimeSmearing(float Q) {
 
 G4float* PMT_R5912HQE::Getqpe() //currently uses the same as 20inch
    {
+  //------OLD------
+  /*
   static G4float qpe0[501]= {
     // 1
     0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
@@ -2266,26 +2268,166 @@ G4float* PMT_R5912HQE::Getqpe() //currently uses the same as 20inch
     0.999996, 0.999998, 0.999999, 1.000000, 1.000000,
     // Dummy element for noticing if the loop reached the end of the array
     0.0 
+  };*/
+  //----OLD END----
+  
+  //----NEW------ (SPE distributions from calibration results)
+  static G4float qpe0[501]= {
+    // 1
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    // 2
+    0.001797, 0.004204, 0.007384, 0.011504, 0.016801, 
+    0.023518, 0.03192, 0.042288, 0.054852, 0.069939, 
+    0.087809, 0.108687, 0.132747, 0.16002, 0.190608, 
+    0.224447, 0.261372, 0.301114, 0.343256, 0.387399, 
+    0.433009, 0.479493, 0.52622, 0.572569, 0.617914, 
+    0.661672, 0.703324, 0.74243, 0.778714, 0.811869, 
+    0.841751, 0.868317, 0.891612, 0.911831, 0.929086, 
+    0.943612, 0.955672, 0.96555, 0.973569, 0.979961, 
+    0.984987, 0.988884, 0.991865, 0.994129, 0.995815, 
+    0.997052, 0.997949, 0.998589, 0.999044, 0.999361,
+    // 3
+    0.999577, 0.999724, 0.999822, 0.999887, 0.999929, 
+    0.999956, 0.999973, 0.999984, 0.99999, 0.999994, 
+    0.999997, 0.999998, 0.999999, 0.999999, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 4
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 5
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 6
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 7
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 8
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 9
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // 10
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000,
+    // Dummy element for noticing if the loop reached the end of the array
+    0.0 
   };
+
    return qpe0;
   }
 
 G4float* PMT_R5912HQE::GetQE(){
- static G4float QE[20] =
-   { 0.00, .0502, .2017, .2933, .3306, .3396, .3320, .3168, .2915, .2655, 
-      .2268,  .1971, .1641, .1102, .0727, .0499, .0323, .0178, .0061, 0.00};
+ //----OLD---
+ //static G4float QE[20] =
+ //  { 0.00, .0502, .2017, .2933, .3306, .3396, .3320, .3168, .2915, .2655, 
+ //     .2268,  .1971, .1641, .1102, .0727, .0499, .0323, .0178, .0061, 0.00};
+ //----------
+ 
+ //----NEW---  (taken from datasheet)
+ static G4float QE[20] = 
+    { 0.01306, 0.1406, 0.26262, 0.33535, 0.34392, 0.34501, 0.34095, 0.31911, 0.28041, 0.25956, 0.21263, 
+      0.19314, 0.15488, 0.10354, 0.06958, 0.04832, 0.0327, 0.02236, 0.01239, 0.00542};
+  //---------
  return QE;
 }
-G4float* PMT_R5912HQE::GetQEWavelength(){static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+
+G4float* PMT_R5912HQE::GetQEWavelength(){
+  //----OLD---
+  //static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+  //----------
+
+  //---NEW ---- (from datasheet)
+  static G4float wavelength[20] = {280., 301., 317., 341., 354., 380., 393., 419., 445., 458., 484., 496., 522., 541., 560., 583., 604., 620., 640., 660.};
+  //------------
   return wavelength;}
 
 G4float  PMT_R5912HQE::GetmaxQE(){
-  const G4float maxQE = 0.3396;
+  //----OLD-----
+  //const G4float maxQE = 0.3396;
+  //-----------
+
+  //-----NEW-----
+  const G4float maxQE = 0.34501;
+  //------------
   return maxQE;
 }
 
 G4float PMT_R5912HQE::GetDarkRate(){
-  const G4float rate = 3*CLHEP::kilohertz;   //Ref??R5912HQE HQE?? (need verification)
+  const G4float rate = 3*CLHEP::kilohertz;   //Ref??R5912HQE HQE?? (need verification)  //TODO: Set PMT wise dark rates
   return rate;
 }
 
@@ -2320,6 +2462,8 @@ G4float PMT_D784KFLB::HitTimeSmearing(float Q) {
 
 G4float* PMT_D784KFLB::Getqpe() //currently uses the same as 20inch
    {
+  //---------OLD------------
+  /*
   static G4float qpe0[501]= {
     // 1
     0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
@@ -2432,13 +2576,129 @@ G4float* PMT_D784KFLB::Getqpe() //currently uses the same as 20inch
     0.999995, 0.999995, 0.999996, 0.999996, 0.999996,
     0.999996, 0.999998, 0.999999, 1.000000, 1.000000,
     // Dummy element for noticing if the loop reached the end of the array
-    0.0 
+    0.0 */
+    //----- OLD (END) ------------
+
+    // -------NEW------------	(SPE distributions from calibration data)
+    static G4float qpe0[501]= {
+    // 1
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
+    // 2
+    0.005746, 0.012614, 0.020749, 0.030267, 0.041348, 
+    0.054136, 0.068762, 0.085345, 0.103934, 0.124646, 
+    0.147522, 0.172566, 0.199741, 0.228928, 0.260052, 
+    0.292953, 0.327426, 0.36323, 0.400069, 0.43767, 
+    0.475712, 0.513861, 0.551784, 0.589167, 0.625686, 
+    0.661048, 0.69499, 0.727282, 0.757779, 0.786293, 
+    0.81272, 0.836996, 0.859103, 0.879104, 0.897004, 
+    0.91288, 0.92684, 0.939006, 0.949553, 0.958586, 
+    0.966254, 0.972708, 0.978091, 0.982561, 0.986226, 
+    0.989204, 0.991602, 0.993517, 0.99504, 0.996236, 
+    // 3
+    0.997165, 0.997882, 0.998429, 0.998844, 0.999158, 
+    0.999391, 0.999563, 0.999689, 0.99978, 0.999846, 
+    0.999893, 0.999927, 0.99995, 0.999966, 0.999977, 
+    0.999985, 0.99999, 0.999993, 0.999996, 0.999997, 
+    0.999998, 0.999999, 0.999999, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 4
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 5
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 6
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 7
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 8
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 9
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 10
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // Dummy element for noticing if the loop reached the end of the array
+    0.0
   };
    return qpe0;
   }
 
 G4float* PMT_D784KFLB::GetQE(){
- static G4float QE[20] =
+ static G4float QE[20] =				//Maybe adjust with QE curve from datasheet? It is labeled as "provisional" though, and the values are slightly smaller than our current ones	//TODO
    { 0.00, .0502, .2017, .2933, .3306, .3396, .3320, .3168, .2915, .2655, 
       .2268,  .1971, .1641, .1102, .0727, .0499, .0323, .0178, .0061, 0.00};
  return QE;
@@ -2452,7 +2712,7 @@ G4float  PMT_D784KFLB::GetmaxQE(){
 }
 
 G4float PMT_D784KFLB::GetDarkRate(){
-  const G4float rate = 3*CLHEP::kilohertz;   //Ref??R7081 HQE?? (need verification)
+  const G4float rate = 3*CLHEP::kilohertz;   //Ref??R7081 HQE?? (need verification) //TODO: Add PMT-wise dark rate
   return rate;
 }
 
@@ -2477,7 +2737,8 @@ G4double PMT_R7081::GetExposeHeight() {return 117.*CLHEP::mm;}
 G4double PMT_R7081::GetRadius() {return 127.*CLHEP::mm;}
 G4double PMT_R7081::GetPMTGlassThickness() {return 0.55*CLHEP::cm;}
 float PMT_R7081::HitTimeSmearing(float Q) { 
-  float timingConstant = 3.2; 
+  //float timingConstant = 3.2; //old
+  float timingConstant = 3.4; 	//new-->datasheet
   float timingResolution = 0.33 + sqrt(timingConstant/Q); 
   // looking at SK's jitter function for 20" tubes
   if (timingResolution < 0.58) timingResolution=0.58;
@@ -2487,7 +2748,9 @@ float PMT_R7081::HitTimeSmearing(float Q) {
 
 G4float* PMT_R7081::Getqpe() //currently uses the same as 20inch
    {
-  static G4float qpe0[501]= {
+    //-----------OLD------------
+    /*
+    static G4float qpe0[501]= {
     // 1
     0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
     0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
@@ -2599,27 +2862,163 @@ G4float* PMT_R7081::Getqpe() //currently uses the same as 20inch
     0.999995, 0.999995, 0.999996, 0.999996, 0.999996,
     0.999996, 0.999998, 0.999999, 1.000000, 1.000000,
     // Dummy element for noticing if the loop reached the end of the array
-    0.0 
+    0.0*/
+  static G4float qpe0[501]= {
+    //---------NEW---------- (SPE distributions from calibration data)
+    // 1
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    // 2
+    0.001516, 0.003584, 0.006364, 0.010024, 0.014804, 
+    0.020956, 0.02876, 0.038514, 0.050476, 0.065004, 
+    0.082393, 0.102903, 0.126746, 0.15398, 0.184738, 
+    0.218973, 0.256525, 0.297118, 0.340309, 0.38567, 
+    0.43262, 0.48051, 0.528653, 0.576365, 0.622963, 
+    0.667814, 0.710358, 0.750129, 0.786843, 0.820188, 
+    0.850033, 0.87636, 0.899246, 0.918924, 0.935545, 
+    0.949379, 0.960727, 0.969901, 0.977248, 0.983019, 
+    0.987485, 0.990893, 0.993454, 0.995365, 0.996761, 
+    0.997765, 0.998478, 0.998976, 0.999322, 0.999557, 
+    // 3
+    0.999715, 0.999819, 0.999886, 0.999929, 0.999957, 
+    0.999974, 0.999985, 0.999991, 0.999995, 0.999997, 
+    0.999998, 0.999999, 0.999999, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 4
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 5
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 6
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 7
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 8
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 9
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 10
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // Dummy element for noticing if the loop reached the end of the array
+    0.0
   };
    return qpe0;
   }
 
 G4float* PMT_R7081::GetQE(){
- static G4float QE[20] =
-   { 0.00, .0375, .13, .195, .22, .23, .24, .24, .225, .205,
-     .18, .16, .14, .085, .065, .05, .035, .02, .005, 0.0};
+ //-----------OLD-------------
+ //static G4float QE[20] =
+ //  { 0.00, .0375, .13, .195, .22, .23, .24, .24, .225, .205,
+ //    .18, .16, .14, .085, .065, .05, .035, .02, .005, 0.0};
+ //
+ 
+ //----------NEW-------------- (taken from datasheet)
+ static G4float QE[20] = 
+     {0.00189, 0.0305, 0.14996, 0.2155, 0.24718, 0.25151, 0.24914, 0.24543, 0.23098, 0.22083, 
+      0.19482, 0.17807, 0.14079, 0.11979, 0.08181, 0.05485, 0.03713, 0.01769, 0.00816, 0.00369};
+ //---------------------------
+
  return QE;
 }
-G4float* PMT_R7081::GetQEWavelength(){static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+G4float* PMT_R7081::GetQEWavelength(){
+  //----------OLD-------------
+  //static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+  //
+  
+  //---------NEW-------------
+  static G4float wavelength[20] = {280., 300., 320., 341., 367., 380., 406., 419., 445., 458., 484., 496., 522., 535., 558., 579., 597., 622., 642., 659.};
+  //-------------------------
   return wavelength;}
 
 G4float  PMT_R7081::GetmaxQE(){
-  const G4float maxQE = 0.24;
+  //---------OLD---------------
+  //const G4float maxQE = 0.24;
+  //---------------------------
+  
+  //---------NEW--------------
+  const G4float maxQE = 0.251505538;
+  //--------------------------
   return maxQE;
 }
 
 G4float PMT_R7081::GetDarkRate(){
-  const G4float rate = 3.*CLHEP::kilohertz;   //R-7081??
+  const G4float rate = 3.*CLHEP::kilohertz;   //R-7081?? //TODO: Set PMT-wise dark rate values
   return rate;
 }
 
@@ -2644,7 +3043,8 @@ G4double PMT_R7081HQE::GetExposeHeight() {return 117.*CLHEP::mm;}
 G4double PMT_R7081HQE::GetRadius() {return 127.*CLHEP::mm;}
 G4double PMT_R7081HQE::GetPMTGlassThickness() {return 0.55*CLHEP::cm;}
 G4float PMT_R7081HQE::HitTimeSmearing(float Q) {
-  float timingConstant = 2.0; 
+  //float timingConstant = 2.0; 	//old
+  float timingConstant = 3.4; 		//new
   float timingResolution = 0.33 + sqrt(timingConstant/Q); 
   // looking at SK's jitter function for 20" tubes
   if (timingResolution < 0.58) timingResolution=0.58;
@@ -2654,6 +3054,8 @@ G4float PMT_R7081HQE::HitTimeSmearing(float Q) {
 
 G4float* PMT_R7081HQE::Getqpe() //currently uses the same as 20inch
    {
+    // --------- OLD -----------
+   /*
   static G4float qpe0[501]= {
     // 1
     0.000000, 0.000000, 0.000000, 0.000000, 0.000000,
@@ -2766,27 +3168,164 @@ G4float* PMT_R7081HQE::Getqpe() //currently uses the same as 20inch
     0.999995, 0.999995, 0.999996, 0.999996, 0.999996,
     0.999996, 0.999998, 0.999999, 1.000000, 1.000000,
     // Dummy element for noticing if the loop reached the end of the array
-    0.0 
+    0.0 */
+
+    // ------- NEW --------
+    // Assume the same SPE distribution properties as for R7081 calibration
+    // --------------------
+
+
+  static G4float qpe0[501]= {
+    // 1
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 
+    // 2
+    0.001516, 0.003584, 0.006364, 0.010024, 0.014804, 
+    0.020956, 0.02876, 0.038514, 0.050476, 0.065004, 
+    0.082393, 0.102903, 0.126746, 0.15398, 0.184738, 
+    0.218973, 0.256525, 0.297118, 0.340309, 0.38567, 
+    0.43262, 0.48051, 0.528653, 0.576365, 0.622963, 
+    0.667814, 0.710358, 0.750129, 0.786843, 0.820188, 
+    0.850033, 0.87636, 0.899246, 0.918924, 0.935545, 
+    0.949379, 0.960727, 0.969901, 0.977248, 0.983019, 
+    0.987485, 0.990893, 0.993454, 0.995365, 0.996761, 
+    0.997765, 0.998478, 0.998976, 0.999322, 0.999557, 
+    // 3
+    0.999715, 0.999819, 0.999886, 0.999929, 0.999957, 
+    0.999974, 0.999985, 0.999991, 0.999995, 0.999997, 
+    0.999998, 0.999999, 0.999999, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 4
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 5
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 6
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 7
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 8
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 9
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // 10
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 
+    // Dummy element for noticing if the loop reached the end of the array
+    0.0
+
   };
    return qpe0;
   }
 
 G4float* PMT_R7081HQE::GetQE(){
- static G4float QE[20] =
-   { 0.00, .0502, .2017, .2933, .3306, .3396, .3320, .3168, .2915, .2655, 
-      .2268,  .1971, .1641, .1102, .0727, .0499, .0323, .0178, .0061, 0.00};
+  //-----OLD------
+ //static G4float QE[20] =
+ //  { 0.00, .0502, .2017, .2933, .3306, .3396, .3320, .3168, .2915, .2655, 
+ //     .2268,  .1971, .1641, .1102, .0727, .0499, .0323, .0178, .0061, 0.00};
+ //---------------
+ 
+  //------NEW-----  (from datasheet)
+  static G4float QE[20] = 
+     { 0.01306, 0.1406, 0.26262, 0.33535, 0.34392, 0.34501, 0.34095, 0.31911, 0.28041, 0.25956, 0.21263,
+      0.19314, 0.15488, 0.10354, 0.06958, 0.04832, 0.0327, 0.02236, 0.01239, 0.00542};
+  //---------
  return QE;
 }
-G4float* PMT_R7081HQE::GetQEWavelength(){static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+G4float* PMT_R7081HQE::GetQEWavelength(){
+  //---OLD-------
+  //static G4float wavelength[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+  //------------
+
+  //----NEW------ (from datasheet)
+  static G4float wavelength[20] = {280., 301., 317., 341., 354., 380., 393., 419., 445., 458., 484., 496., 522., 541., 560., 583., 604., 620., 640., 660.};
+  //------------
+
   return wavelength;}
 
 G4float  PMT_R7081HQE::GetmaxQE(){
-  const G4float maxQE = 0.3396;  // datasheet says 35%, leave as-is as it might include other factors?
+  //const G4float maxQE = 0.3396;  // datasheet says 35%, leave as-is as it might include other factors?
+  const G4float maxQE = 0.34501;
   return maxQE;
 }
 
 G4float PMT_R7081HQE::GetDarkRate(){
-  const G4float rate = 8*CLHEP::kilohertz;  // datasheet says 8kHz
+  const G4float rate = 8*CLHEP::kilohertz;  // datasheet says 8kHz //TODO: Set PMT wise dark rates
   return rate;
 }
 
diff --git a/src/WCSimWCDigitizer.cc b/src/WCSimWCDigitizer.cc
index 8859d5e38..ee973edda 100644
--- a/src/WCSimWCDigitizer.cc
+++ b/src/WCSimWCDigitizer.cc
@@ -340,8 +340,9 @@ void WCSimWCDigitizerSKI::DigitizeHits(WCSimWCDigitsCollection* WCHCPMT) {
 	  //Make digit here
 	  if(MakeDigit) {
 	    int iflag;
-	    WCSimWCDigitizerSKI::Threshold(peSmeared,iflag);
-
+	    //WCSimWCDigitizerSKI::Threshold(peSmeared,iflag);
+	    //G4cout <<"peSmeared: "<<peSmeared <<", iflag: "<<iflag<<G4endl;
+            iflag = 0;
 	    //Check if previous hit passed the threshold.  If so we will digitize the hit
 #ifdef WCSIMWCDIGITIZER_VERBOSE
 	    numdigitsrequested++;
@@ -403,7 +404,8 @@ void WCSimWCDigitizerSKI::DigitizeHits(WCSimWCDigitsCollection* WCHCPMT) {
 	    //as the loop will not evaluate again
 	    if(ip+1 == (*WCHCPMT)[i]->GetTotalPe()) {
 	      int iflag;
-	      WCSimWCDigitizerSKI::Threshold(peSmeared,iflag);
+	      //WCSimWCDigitizerSKI::Threshold(peSmeared,iflag);
+              iflag=0;
 	      if(iflag == 0) {
 		//digitize hit
 		peSmeared *= efficiency;