Latest devs in the XML export in sync with CMSSW + Added layout FlatTracker4026#274
Merged
alkemyst merged 11 commits intotkLayout:dev_gabiefrom Dec 15, 2016
Merged
Latest devs in the XML export in sync with CMSSW + Added layout FlatTracker4026#274alkemyst merged 11 commits intotkLayout:dev_gabiefrom
alkemyst merged 11 commits intotkLayout:dev_gabiefrom
Conversation
…rom 2 MB to 1.3 MB, pixel.xml : from 550 KB to 400 KB.
…listings in the XMLs
…ckerProdCuts.xml are now updated and validated
… Phase 1 Pixel files. NB : TO DO : Now that the Phase 1 Pixel is completely removed, all Phase 1 Pixel variables should also disappear.
…hin CMSSW as Flat Tracker. It has the TBPS from the ex flat OT_200.cfg + same TB2S and TEDD as OT_Tilted_V365. This Flat Outer Tracker is called Flat_V0_200. The Pixel is Pixel V 4026.
alkemyst
reviewed
Dec 15, 2016
| for ( vit = volumes.begin(); vit != volumes.end(); vit++ ) { | ||
| if ( !((*vit)->getDensity()>0.) ) continue; | ||
| for (const auto& vit : volumes) { | ||
| if (!(vit->getDensity() > 0.)) continue; |
Contributor
There was a problem hiding this comment.
Maybe we can throw an INFO or WARN here?
alkemyst
reviewed
Dec 15, 2016
| // Special case where a composite with same name already exists | ||
| if (mapCompoToPrintedCompo_.find(nspaceName) != mapCompoToPrintedCompo_.end()) { | ||
| //throw PathfulException("Found several composite materials with same name " + nspaceName); | ||
| std::cout << "VERY IMPORTANT : VOLUME " << nspaceName << " IS DUPLICATED !!!!!!!!!!" << std::endl; |
Contributor
There was a problem hiding this comment.
Can we change this to a logSOMETHING ?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After the merge of these commits, the code in tkLayout/dev_gabie will be in the exact state of what was used for the XML export of FlatTracker4026 and TiltedTracker4026 to CMSSW.
Updates in the XML export :
Worked on the materials XML export.
'Elementary' materials :
They are now in tracker.xml only (they were duplicated in pixel.xml).
They are prefixed by "tkLayout_" for additional safety reasons.
Composite materials (that is to say, all the other materials !) :
They used to be a lot of composites with different names but same actual materials compositions. Redundancies have been deleted.
Design has been chosen towards the safest solution : scan the composite materials once they are created, and print the duplicated materials only once in the XMLs.
First glance solution that module materials could be categorized (category 'module type + dsDistance' for example, or similar), turned out to be impossible from the materials point of view, and is also much less safe.
Other changes in the XML export :
Added FlatTracker4026.
The soup recipe is the following :