Author: [log in to unmask] Date: Wed May 20 13:22:18 2015 New Revision: 3612 Log: Updates to the lcdd (using the Birks processor for HCAL hits) Updates to the pandora file (different time cut) Updates to CalorimeterCalibration (new sampling fractions) Modified: projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/CalorimeterCalibration.properties projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3.lcdd projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3_pandora.xml Modified: projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/CalorimeterCalibration.properties ============================================================================= --- projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/CalorimeterCalibration.properties (original) +++ projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/CalorimeterCalibration.properties Wed May 20 13:22:18 2015 @@ -8,21 +8,21 @@ # determined from single muons # values are RAW energy -ECalMip_MPV = 9.6E-5 -ECalMip_sig = 1.2E-5 +ECalMip_MPV = 1.06E-4 +ECalMip_sig = 1.29E-5 -# Cut at values less than MPV-3*sigma -ECalMip_Cut = 6.0E-5 +# Cut at values less than 0.5 MPV +ECalMip_Cut = 6.5E-5 HCalLayering = 0 # determined from single muons # values are RAW energy -HCalMip_MPV = 1.1E-3 -HCalMip_sig = 1.0E-4 +HCalMip_MPV = 4.8E-4 +HCalMip_sig = 3.2E-5 # Cut at values less than MPV-3*sigma -HCalMip_Cut = 6.0E-4 +HCalMip_Cut = 3.8E-4 MuonLayering = 0 @@ -34,20 +34,19 @@ # Cut at values less than MPV-3*sigma MuonMip_Cut = 0. - # cut at times greater than this -timeCut = 100. +timeCut = 150. # sampling fractions.. -EMBarrel_SF = 1., 0.01722385121673009, 0.008416088310520672, 0.03184707928142987, 1. +EMBarrel_SF = 1., 0.017268317406016646, 0.008392453557610932, 0.030464514470636167, 1. -EMEndcap_SF = 1., 0.017789078755246445, 0.008687459547437796, 0.02137296616430786, 1. +EMEndcap_SF = 1., 0.017899529407144, 0.008650237166149063, 0.02469256710011939, 1. -HadBarrel_SF = 1., 0.015372217121921496, 0.008808427665509693, 0.02353944951903077, 1. +HadBarrel_SF = 1., 0.01646358796104782, 0.009673565775345776, 0.024731433904173383, 1. -HadEndcap_SF = 1., 0.016263072260238976, 0.009047001260111882, 0.020536733999800907, 1. +HadEndcap_SF = 1., 0.016935516139644717, 0.01017768897669397, 0.02234121847794034, 1. PhotonFitParameters = gamma_em1b_0, gamma_em1b_1, gamma_em1e_0, gamma_em1e_1, gamma_em2b_0, gamma_em2b_1, gamma_em2e_0, gamma_em2e_1, gamma_hadb_0, gamma_hadb_1, gamma_hade_0, gamma_hade_1 @@ -90,5 +89,3 @@ # This collection has had the time and mip cuts applied ProcessedHitsCollectionName = ProcessedCalHits - - Modified: projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3.lcdd ============================================================================= --- projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3.lcdd (original) +++ projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3.lcdd Wed May 20 13:22:18 2015 @@ -133,6 +133,7 @@ </calorimeter> <calorimeter name="HcalBarrel" ecut="0.0" eunit="MeV" verbose="0" hits_collection="HcalBarrelHits"> <idspecref ref="HcalBarrelHits" /> + <hit_processor type="ScintillatorCalorimeterHitProcessor"/> <grid_xyz grid_size_x="30.0" grid_size_y="30.0" grid_size_z="0.0" /> </calorimeter> <calorimeter name="MuonBarrel" ecut="0.0" eunit="MeV" verbose="0" hits_collection="MuonBarrelHits"> @@ -144,6 +145,7 @@ </tracker> <calorimeter name="HcalEndcap" ecut="0.0" eunit="MeV" verbose="0" hits_collection="HcalEndcapHits"> <idspecref ref="HcalEndcapHits" /> + <hit_processor type="ScintillatorCalorimeterHitProcessor"/> <global_grid_xy grid_size_x="30.0" grid_size_y="30.0" /> </calorimeter> <calorimeter name="LumiCal" ecut="0.0" eunit="MeV" verbose="0" hits_collection="LumiCalHits"> Modified: projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3_pandora.xml ============================================================================= --- projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3_pandora.xml (original) +++ projects/lcsim/trunk/detector-data/detectors/sidloi3_scint3x3/sidloi3_scint3x3_pandora.xml Wed May 20 13:22:18 2015 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pandoraSetup> <calorimeters> - <calorimeter type="EM_ENDCAP" innerR="200.0" innerZ="1657.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1294.1" outerZ="1795.5" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false"> + <calorimeter type="EM_ENDCAP" innerR="200.0" innerZ="1657.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1294.1" outerZ="1795.5" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000106" mipSigma="0.0000129" mipCut="0.000065" timeCut="150" digital="false"> <id> <field name="system" length="6" start="0" signed="false" /> <field name="barrel" length="3" start="6" signed="false" /> @@ -45,7 +45,7 @@ <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1794.66" cellThickness="6.25" samplingFraction="0.00868746" emSamplingFraction="0.00868746" hadSamplingFraction="0.009047" /> </layers> </calorimeter> - <calorimeter type="HAD_BARREL" innerR="1419.0" innerZ="-3018.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2628.5662220612007" outerZ="3018.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.0011" mipSigma="0.0001" mipCut="0.0006" timeCut="100" digital="false"> + <calorimeter type="HAD_BARREL" innerR="1419.0" innerZ="-3018.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2628.5662220612007" outerZ="3018.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00048" mipSigma="0.000032" mipCut="0.00038" timeCut="150" digital="false"> <id> <field name="system" length="6" start="0" signed="false" /> <field name="barrel" length="3" start="6" signed="false" /> @@ -98,7 +98,7 @@ <layer radLen="1.09010717" intLen="0.11905837" distanceToIp="2531.4" cellThickness="28" samplingFraction="0.02353945" emSamplingFraction="0.03184708" hadSamplingFraction="0.02353945" /> </layers> </calorimeter> - <calorimeter type="MUON_BARREL" innerR="3464.0" innerZ="-2983.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6606.921990584773" outerZ="2983.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true"> + <calorimeter type="MUON_BARREL" innerR="3464.0" innerZ="-2983.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6606.921990584773" outerZ="2983.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="150" digital="true"> <id> <field name="system" length="8" start="0" signed="false" /> <field name="barrel" length="3" start="8" signed="false" /> @@ -122,7 +122,7 @@ <layer radLen="11.46520559" intLen="1.20022601" distanceToIp="5871.5" cellThickness="240" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" /> </layers> </calorimeter> - <calorimeter type="HAD_ENDCAP" innerR="200.0" innerZ="1805.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1458.7" outerZ="3065.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.0011" mipSigma="0.0001" mipCut="0.0006" timeCut="100" digital="false"> + <calorimeter type="HAD_ENDCAP" innerR="200.0" innerZ="1805.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1458.7" outerZ="3065.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00048" mipSigma="0.000032" mipCut="0.00038" timeCut="150" digital="false"> <id> <field name="system" length="6" start="0" signed="false" /> <field name="barrel" length="3" start="6" signed="false" /> @@ -180,7 +180,7 @@ <layer radLen="1.09010717" intLen="0.11905837" distanceToIp="3057.4" cellThickness="28" samplingFraction="0.02053673" emSamplingFraction="0.02137297" hadSamplingFraction="0.02053673" /> </layers> </calorimeter> - <calorimeter type="MUON_ENDCAP" innerR="200.0" innerZ="3028.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6498.7" outerZ="5668.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true"> + <calorimeter type="MUON_ENDCAP" innerR="200.0" innerZ="3028.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6498.7" outerZ="5668.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="150" digital="true"> <id> <field name="system" length="8" start="0" signed="false" /> <field name="barrel" length="3" start="8" signed="false" /> @@ -204,7 +204,7 @@ <layer radLen="11.46520559" intLen="1.20022601" distanceToIp="5635.5" cellThickness="240" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" /> </layers> </calorimeter> - <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1453.0101192055515" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false"> + <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1453.0101192055515" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000106" mipSigma="0.0000129" mipCut="0.000065" timeCut="150" digital="false"> <id> <field name="system" length="6" start="0" signed="false" /> <field name="barrel" length="3" start="6" signed="false" /> ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the LCDET-SVN list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1