[WIP] First DECal / SiW ECal commit #294

tonyPbA · 2018-03-07T00:11:08Z

Addresses # .

Changes proposed in this pull-request:

To be done:

[run scripts currently fail due to moving from v0.8 to v0.9. Currently working on this]
[ ]

…added script to run a simulation then reconstruct

… This generates the tree for statisics analysis. Also changed syntax for xml file naming to make easier to submit different geometry from single top level file. Setup file for SiW analogue readout with 300um of Silicon as sensitive layer, 50 layers of 2.1mm W

…on digital hits. Default values still work with other Calorimeters

Conflicts: Detector/DetSensitive/src/SDWrapper.cpp

…espaces

…d code ready for PR

phsft-bot · 2018-03-07T00:12:02Z

Can one of the admins verify this patch?

zaborowska · 2018-03-09T12:49:49Z

ok to test

phsft-bot · 2018-03-09T12:52:22Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-09T13:21:41Z

All tests succeeded

JavierCVilla · 2018-03-12T12:16:22Z

@phsft-bot build please

phsft-bot · 2018-03-12T12:17:43Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-12T12:46:36Z

All tests succeeded

phsft-bot · 2018-03-13T08:32:58Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-13T09:00:44Z

Build failed on slc6/gcc62
See console output.

phsft-bot · 2018-03-13T10:17:24Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-13T10:43:00Z

Build failed on slc6/gcc62
See console output.

Failing tests:

projectroot.TestReconstruction.CountCellsXYZ

phsft-bot · 2018-03-20T10:13:01Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-20T10:40:36Z

Build failed on slc6/gcc62
See console output.

Failing tests:

projectroot.TestReconstruction.CountCellsXYZ

phsft-bot · 2018-03-20T10:57:26Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-20T11:26:36Z

Build failed on slc6/gcc62
See console output.

Failing tests:

projectroot.TestReconstruction.CountCellsXYZ

phsft-bot · 2018-03-21T23:02:29Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-03-21T23:32:14Z

Build failed on slc6/gcc62
See console output.

Failing tests:

projectroot.TestReconstruction.CountCellsXYZ

phsft-bot · 2018-04-07T22:37:53Z

Starting build on slc6/gcc62
How to customize builds

phsft-bot · 2018-04-07T23:06:46Z

Build failed on slc6/gcc62
See console output.

Failing tests:

projectroot.TestReconstruction.CountCellsXYZ

zaborowska

Hi Tony!

thanks a lot for your contribution!
I have some comments, but most of them will be addressed if you run checkformat on changed/new files (but it is important to commit other changes first, do the checkformat, and commit those changes, otherwise it may be difficult for me to follow relevant updates).
Also, a clean-up of all the python configs is rather necessary. And updates of the doxygen comments, so it is actually easier to understand what is the purpose of each file.

Thanks!
Anna

zaborowska · 2018-05-07T09:47:19Z

Detector/DetCommon/compact/HcalBarrelAir.xml

+      <comment>Envelope for HCal barrel</comment>
+      <dimensions rmin="BarHCal_rmin+HcalSpacer" rmax="BarHCal_rmax" dz="BarHCal_dz" phi0="0" deltaphi="360*deg" z_offset="0*cm" material="Air"/>
+    </detector>
+    <!-- End-caps -->


If you need it just for the barrel, remove the commented out code.

zaborowska · 2018-05-07T09:47:56Z

Detector/DetCommon/compact/TrackerBarrelAir.xml

+      <comment>Envelope for Tracker</comment>
+      <dimensions rmin="Tracker_rmin" rmax="Tracker_rmax" dz="Tracker_dz" phi0="0" deltaphi="360*deg" z_offset="0*cm" material="Air"/>
+    </detector>
+        <!-- Forward detectors -->


Same as above, remove the commented out code.

zaborowska · 2018-05-07T09:49:13Z

Detector/DetComponents/src/RedoSegmentation.cpp

@@ -17,6 +17,7 @@ DECLARE_ALGORITHM_FACTORY(RedoSegmentation)
 RedoSegmentation::RedoSegmentation(const std::string& aName, ISvcLocator* aSvcLoc) : GaudiAlgorithm(aName, aSvcLoc) {
  declareProperty("inhits", m_inHits, "Hit collection with old segmentation (input)");
  declareProperty("outhits", m_outHits, "Hit collection with modified segmentation (output)");
+


If you do changes to the file, please run checkformat afterwards.
The recommended way is to commit all your changes and then do checkformat -i <NAME_OF_CHANGED_FILE> and commit again.

zaborowska · 2018-05-07T09:53:28Z

Detector/DetComponents/src/RedoSegmentation.cpp

@@ -107,6 +114,7 @@ StatusCode RedoSegmentation::execute() {
      debugIter++;
    }
  }
+  info() << "nhits = " << nhits << endmsg;


That probably should be in debug() or I'd suggest even verbose() to avoid unnecessary printouts (or maybe even delete this line?)

zaborowska · 2018-05-07T09:53:51Z

Detector/DetComponents/src/RedoSegmentation.h

@@ -83,5 +83,6 @@ class RedoSegmentation : public GaudiAlgorithm {
  std::vector<std::string> m_detectorIdentifiers;
  /// Limit of debug printing
  Gaudi::Property<uint> m_debugPrint{this, "debugPrint", 10, "Limit of debug printing"};
+


That should disappear if you run checkformat on that file.

zaborowska · 2018-05-07T10:37:52Z

Reconstruction/RecCalorimeter/src/components/CreateCaloCells.h

  /// Handle for calo hits (input collection)
  DataHandle<fcc::CaloHitCollection> m_hits{"hits", Gaudi::DataHandle::Reader, this};
  /// Handle for calo cells (output collection)
-  DataHandle<fcc::CaloHitCollection> m_cells{"cells", Gaudi::DataHandle::Writer, this};
+  DataHandle<fcc::CaloHitCollection> m_cells{"cellsm", Gaudi::DataHandle::Writer, this};


Why cellsm?

zaborowska · 2018-05-07T10:38:26Z

Sim/SimG4Components/src/SimG4SaveCalHits.cpp

@@ -69,6 +69,13 @@ StatusCode SimG4SaveCalHits::saveOutput(const G4Event& aEvent) {
          auto edmHit = edmHits->create();
          auto& edmHitCore = edmHit.core();
          edmHitCore.cellId = hit->cellID;
+          // added by Tony Price for timing


not necessary, github can tell us that ;)

zaborowska · 2018-05-07T10:39:33Z

Test/TestReconstruction/tests/options/testcellcountingXYZ.py

-                         fieldNames=["system"],
-                         fieldValues=[0],
-                         volumeMatchName="BoxECal",
+cells = TestCellCounting("cells", 


Does it work now?

zaborowska · 2018-05-07T10:42:56Z

analyse_DEcal_particles.py

@@ -0,0 +1,267 @@
+from ROOT import TH1F, TTree, TChain, TFile, TF1, TH2F, TGraphErrors, TCanvas, TPaveText


That file should not be in the main directory. Please clean it up, comment as much as possible, remove the paths to your code (any possible inputs like e.g. file names can be entered as arguments see here). This could probably go to Detector/DetectorFCChhECalDigital/scripts/.

zaborowska · 2018-05-07T10:44:47Z

analyse_SiW.py

@@ -0,0 +1,132 @@
+from ROOT import TH1F, TTree, TChain, TFile, TF1, TCanvas, TGraphErrors, TPaveText


same as above. Do you by any chance mean analogue when you name files SiW? I find it quite misleading, as digital is SiW as well, isn't it? (or Pb)

Tony Price and others added 25 commits November 17, 2016 23:45

toprice first commit of DECAL geometry

8479e80

first commit of the DECAL before updating master FCCSW

2fd40d7

Merge remote branch 'hep-fcc/master'

ba42ad9

DECAL Geometry first commit

ba49172

SD classes for DECAL

e838711

Redo Segmentation of DECAL pixel to Pad

acd1cad

Merge with v0.8 SDWrapper.cpp

fd3674e

added back in geant_fullsim_ecal_SPG_new.py

e5210b8

Merge remote branch 'hep-fcc/master'

f8feb3e

Added basic plotting for the DECAL into Detector/DetectorStudies and …

2e12c47

…added script to run a simulation then reconstruct

file to calculate the non linearity factor from total counts in an event

ae03431

New xml files to run epitaxial and subtrate (analogue) Silicon ECAL

77a19a6

Analysis code to extract analogue component and analyse

cc7e7a2

code which creates resolution plot from SiWAnalysis

e627926

code which creates resoltuion plot from DECalAnalysis

80030f6

code to submit analogue analysis to lxbatch

12bb45c

Previous commit did not take into account changes to pre-existing code

5b42744

Added in flags to DetSegmentation to allow extraction of Digital or n…

40b9222

…on digital hits. Default values still work with other Calorimeters

Many many changes....

b671bef

added many things....

2f7de76

Merge remote branch 'hep-fcc/master'

f408156

Conflicts: Detector/DetSensitive/src/SDWrapper.cpp

Modified DECal geometry to match with DD4hep-->dd4hep and removed nam…

1361ac2

…espaces

Fixed DD4hep depenacies

47b2b43

modified DD4hep/LCCD.h for DD4hep/Detector.h and removed all commente…

06f4b22

…d code ready for PR

tonyPbA changed the title ~~First DECal / SiW ECal commit~~ [WIP] First DECal / SiW ECal commit Mar 7, 2018

Changing xml child levels

d295777

Modified XML file to take childs of calorimeter

a3e14ae

tonypba added 3 commits March 20, 2018 11:44

Removed all old xml files

8fa4bb7

Fixed xml file

b5dfa6a

Actually fixed XML file this time

57c968c

added scripts to submit pile up events

b047b93

modified pile-up files and hacked geometry to just draw a single stave

e6c1161

zaborowska requested changes May 7, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] First DECal / SiW ECal commit #294

[WIP] First DECal / SiW ECal commit #294

tonyPbA commented Mar 7, 2018

phsft-bot commented Mar 7, 2018

zaborowska commented Mar 9, 2018

phsft-bot commented Mar 9, 2018

phsft-bot commented Mar 9, 2018

JavierCVilla commented Mar 12, 2018 •

edited

Loading

phsft-bot commented Mar 12, 2018

phsft-bot commented Mar 12, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 21, 2018

phsft-bot commented Mar 21, 2018

phsft-bot commented Apr 7, 2018

phsft-bot commented Apr 7, 2018

zaborowska left a comment

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

zaborowska May 7, 2018

		@@ -0,0 +1,267 @@
		from ROOT import TH1F, TTree, TChain, TFile, TF1, TH2F, TGraphErrors, TCanvas, TPaveText

		@@ -0,0 +1,132 @@
		from ROOT import TH1F, TTree, TChain, TFile, TF1, TCanvas, TGraphErrors, TPaveText

[WIP] First DECal / SiW ECal commit #294

Are you sure you want to change the base?

[WIP] First DECal / SiW ECal commit #294

Conversation

tonyPbA commented Mar 7, 2018

phsft-bot commented Mar 7, 2018

zaborowska commented Mar 9, 2018

phsft-bot commented Mar 9, 2018

phsft-bot commented Mar 9, 2018

JavierCVilla commented Mar 12, 2018 • edited Loading

phsft-bot commented Mar 12, 2018

phsft-bot commented Mar 12, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

phsft-bot commented Mar 13, 2018

Failing tests:

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 20, 2018

Failing tests:

phsft-bot commented Mar 20, 2018

phsft-bot commented Mar 20, 2018

Failing tests:

phsft-bot commented Mar 21, 2018

phsft-bot commented Mar 21, 2018

Failing tests:

phsft-bot commented Apr 7, 2018

phsft-bot commented Apr 7, 2018

Failing tests:

zaborowska left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JavierCVilla commented Mar 12, 2018 •

edited

Loading