Skip to content

Commit

Permalink
Merge pull request #7 from mnieslony/spe_distributions
Browse files Browse the repository at this point in the history 
SPE distributions
  • Loading branch information
@marc1uk
marc1uk authored Oct 13, 2021
2 parents 5ae94ae + 4bab9a9 commit f919a6e
Show file tree
Hide file tree
Showing 6 changed files with 605 additions and 45 deletions.
29 changes: 22 additions & 7 deletions setupenvsfnal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,28 @@ 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

# setup genie_xsec v2_8_6 -q default

# 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
Expand All @@ -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
Expand All @@ -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/
2 changes: 1 addition & 1 deletion src/ConstructANNIE.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 11 additions & 7 deletions src/WCSimConstructANNIECylinderScan.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/WCSimDetectorConstruction.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit f919a6e

Please sign in to comment.