Merging two methods, no longer needed to be separated after the death of TreeT

[u/mrichter/AliRoot.git] / STEER / AliTriggerDetector.cxx

diff --git a/STEER/AliTriggerDetector.cxx b/STEER/AliTriggerDetector.cxx
index e5f8eb2af281ce04be60a9f0aa6480b2dd2a15ba..9843aa5bac28a9687ff921bb9729a9b2953ec86d 100644 (file)
--- a/STEER/AliTriggerDetector.cxx
+++ b/STEER/AliTriggerDetector.cxx
@@ -44,10 +44,12 @@
 ClassImp( AliTriggerDetector )
 
 //_____________________________________________________________________________
-AliTriggerDetector::AliTriggerDetector() : TNamed()
+AliTriggerDetector::AliTriggerDetector() :
+  TNamed(),
+  fMask(0),
+  fInputs()
 {
    // Default constructor
-   fMask    = 0;
 }
 
 //_____________________________________________________________________________
@@ -105,9 +107,7 @@ void AliTriggerDetector::Trigger()
 void AliTriggerDetector::SetInput( TString& name )
 {
    // Set Input by name
-   AliTriggerInput* in = ((AliTriggerInput*)fInputs.FindObject( name.Data() ));
-   in->Set();
-   fMask |= in->GetValue();
+   SetInput( name.Data() );
 }
 
 //_____________________________________________________________________________
@@ -115,8 +115,11 @@ void AliTriggerDetector::SetInput( const char * name )
 {
    // Set Input by name
    AliTriggerInput* in = ((AliTriggerInput*)fInputs.FindObject( name ));
-   in->Set();
-   fMask |= in->GetValue();
+   if( in ) {
+      in->Set();
+      fMask |= in->GetValue();
+   } else
+      AliError( Form( "There is not input named %s", name ) );
 }
 
 //_____________________________________________________________________________