From: fca Date: Fri, 12 Nov 1999 14:30:18 +0000 (+0000) Subject: Put the checks on the version in the creator before the geometry is built X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=da39da0cb6f6bc842a53fe829ee5d4c7ad5084dc;p=u%2Fmrichter%2FAliRoot.git Put the checks on the version in the creator before the geometry is built --- diff --git a/TOF/AliTOFv0.cxx b/TOF/AliTOFv0.cxx index 7310c5f0f37..960c8019497 100644 --- a/TOF/AliTOFv0.cxx +++ b/TOF/AliTOFv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.14 1999/11/05 22:39:06 fca +New hits structure + Revision 1.13 1999/11/01 20:41:57 fca Added protections against using the wrong version of FRAME @@ -84,6 +87,19 @@ AliTOFv0::AliTOFv0(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=0) { + Error("Ctor","FRAME version 0 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -487,19 +503,6 @@ void AliTOFv0::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=0) { - Error("Ctor","FRAME version 0 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv1.cxx b/TOF/AliTOFv1.cxx index 1f04f5e5cdb..3af1a9f3c5a 100644 --- a/TOF/AliTOFv1.cxx +++ b/TOF/AliTOFv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.14 1999/11/05 22:39:06 fca +New hits structure + Revision 1.13 1999/11/01 20:41:57 fca Added protections against using the wrong version of FRAME @@ -84,6 +87,20 @@ AliTOFv1::AliTOFv1(const char *name, const char *title) // // Standard constructor // + + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=0) { + Error("Ctor","FRAME version 0 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -495,19 +512,6 @@ void AliTOFv1::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=0) { - Error("Ctor","FRAME version 0 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv2.cxx b/TOF/AliTOFv2.cxx index fed0ce8bbe1..4c57fa17552 100644 --- a/TOF/AliTOFv2.cxx +++ b/TOF/AliTOFv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.14 1999/11/05 22:39:06 fca +New hits structure + Revision 1.13 1999/11/01 20:41:57 fca Added protections against using the wrong version of FRAME @@ -85,6 +88,19 @@ AliTOFv2::AliTOFv2(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=1) { + Error("Ctor","FRAME version 1 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -494,19 +510,6 @@ void AliTOFv2::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=1) { - Error("Ctor","FRAME version 1 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv3.cxx b/TOF/AliTOFv3.cxx index 1299abf007a..b7691b94874 100644 --- a/TOF/AliTOFv3.cxx +++ b/TOF/AliTOFv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.14 1999/11/05 22:39:06 fca +New hits structure + Revision 1.13 1999/11/02 11:26:39 fca added stdlib.h for exit @@ -85,6 +88,19 @@ AliTOFv3::AliTOFv3(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=1) { + Error("Ctor","FRAME version 1 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -499,19 +515,6 @@ void AliTOFv3::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=1) { - Error("Ctor","FRAME version 1 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv4.cxx b/TOF/AliTOFv4.cxx index c70e33e8c66..b6a524f6917 100644 --- a/TOF/AliTOFv4.cxx +++ b/TOF/AliTOFv4.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 1999/11/05 22:39:06 fca +New hits structure + Revision 1.3 1999/11/01 20:41:57 fca Added protections against using the wrong version of FRAME @@ -77,6 +80,19 @@ AliTOFv4::AliTOFv4(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=0) { + Error("Ctor","FRAME version 0 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -389,19 +405,6 @@ void AliTOFv4::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=0) { - Error("Ctor","FRAME version 0 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv5.cxx b/TOF/AliTOFv5.cxx index 400b382649d..83545cee79a 100644 --- a/TOF/AliTOFv5.cxx +++ b/TOF/AliTOFv5.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 1999/11/05 22:39:06 fca +New hits structure + Revision 1.3 1999/11/01 20:41:58 fca Added protections against using the wrong version of FRAME @@ -78,6 +81,19 @@ AliTOFv5::AliTOFv5(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=1) { + Error("Ctor","FRAME version 1 needed with this version of TOF\n"); + exit(1); + } + } //_____________________________________________________________________________ @@ -390,19 +406,6 @@ void AliTOFv5::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=1) { - Error("Ctor","FRAME version 1 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1"); diff --git a/TOF/AliTOFv6.cxx b/TOF/AliTOFv6.cxx index cdc31868b99..6d82d6c7cee 100644 --- a/TOF/AliTOFv6.cxx +++ b/TOF/AliTOFv6.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 1999/11/05 22:39:06 fca +New hits structure + Revision 1.3 1999/11/01 20:41:58 fca Added protections against using the wrong version of FRAME @@ -77,6 +80,18 @@ AliTOFv6::AliTOFv6(const char *name, const char *title) // // Standard constructor // + // + // Check that FRAME is there otherwise we have no place where to + // put TOF + AliModule* FRAME=gAlice->GetModule("FRAME"); + if(!FRAME) { + Error("Ctor","TOF needs FRAME to be present\n"); + exit(1); + } else + if(FRAME->IsVersion()!=1) { + Error("Ctor","FRAME version 1 needed with this version of TOF\n"); + exit(1); + } } //_____________________________________________________________________________ @@ -398,19 +413,6 @@ void AliTOFv6::Init() AliTOF::Init(); - // - // Check that FRAME is there otherwise we have no place where to - // put TOF - AliModule* FRAME=gAlice->GetModule("FRAME"); - if(!FRAME) { - Error("Ctor","TOF needs FRAME to be present\n"); - exit(1); - } else - if(FRAME->IsVersion()!=1) { - Error("Ctor","FRAME version 1 needed with this version of TOF\n"); - exit(1); - } - fIdFTO2=gMC->VolId("FTO2"); fIdFTO3=gMC->VolId("FTO3"); fIdFLT1=gMC->VolId("FLT1");