Skip to content
Snippets Groups Projects
Commit 7ade25e0 authored by Dave Casper's avatar Dave Casper
Browse files

Merge branch 'fasernu04-mctzero' into 'FASERNU-04'

ID dictionary versioning for backward compatibility

See merge request faser/calypso!368
parents 5dec9fe4 54f5a5e7
No related branches found
No related tags found
No related merge requests found
<IdDictionary name="Neutrino"> <IdDictionary name="Neutrino" version="FASERNU-03-770">
<field name="part"> <field name="part">
<label name="Emulsion" value="1" /> <label name="Emulsion" value="1" />
......
<IdDictionary name="Neutrino"> <IdDictionary name="Neutrino" version="FASERNU-04-730">
<field name="part"> <field name="part">
<label name="Emulsion" value="1" /> <label name="Emulsion" value="1" />
......
...@@ -246,6 +246,8 @@ EmulsionID::initialize_from_dictionary(const IdDictMgr& dict_mgr) ...@@ -246,6 +246,8 @@ EmulsionID::initialize_from_dictionary(const IdDictMgr& dict_mgr)
<< std::endl; << std::endl;
} }
FaserDetectorID::setDictVersion(dict_mgr, "Neutrino");
return 0; return 0;
} }
......
...@@ -45,11 +45,18 @@ void NeutrinoHitIdHelper::Initialize() { ...@@ -45,11 +45,18 @@ void NeutrinoHitIdHelper::Initialize() {
const EmulsionID* pix; const EmulsionID* pix;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "NeutrinoHitIdHelper"); ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "NeutrinoHitIdHelper");
if (detStore.retrieve().isSuccess()) { if (detStore.retrieve().isSuccess()) {
if (detStore->retrieve(pix, "EmulsionID").isFailure()) { pix = 0; } if (detStore->retrieve(pix, "EmulsionID").isFailure()) { pix = nullptr; }
}
if (pix == nullptr || pix->dictionaryVersion() == "FASERNU-03-770" || pix->dictionaryVersion() == "")
{
InitializeField("Module", 0, 34);
InitializeField("Base", 0, 21);
}
else // FASERNU-04-730
{
InitializeField("Module", 0, 72);
InitializeField("Base", 0, 9);
} }
InitializeField("Module", 0, 72);
InitializeField("Base", 0, 9);
InitializeField("Film", 0, 1); InitializeField("Film", 0, 1);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment