X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliTriggerConfiguration.cxx;h=2c3cbb2efe1d25dc60bac71bd076f14687e98e7c;hb=17fd2848ebce9292da187407540f34c2e1dcf047;hp=6bf724ebe53cdd5d06c7cf47b30a1b8000b0f14a;hpb=33c3c91a040995417ea28c5ae034899b77cca3a6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliTriggerConfiguration.cxx b/STEER/AliTriggerConfiguration.cxx
index 6bf724ebe53..2c3cbb2efe1 100755
--- a/STEER/AliTriggerConfiguration.cxx
+++ b/STEER/AliTriggerConfiguration.cxx
@@ -153,7 +153,7 @@ Bool_t AliTriggerConfiguration::AddInput( AliTriggerInput* input )
     return kTRUE;
   }
   else {
-    AliError("CTP can handle up to 50 inputs ! Impossible to add the required input !");
+    AliError("CTP can handle up to 60 inputs ! Impossible to add the required input !");
     return kFALSE;
   }
 }
@@ -278,7 +278,7 @@ Bool_t AliTriggerConfiguration::AddMask( AliTriggerBCMask* mask )
 {
   // Add a trigger bunch-crossing mask object to
   // the list of the trigger bunch-crossing masks
-  if (fMasks.GetEntries() < kNMaxMasks) {
+  if (fMasks.GetEntries() < (kNMaxMasks+1)) {  //+1 to account for NONE
       fMasks.AddLast( mask );
       return kTRUE;
   }
@@ -586,6 +586,7 @@ Bool_t AliTriggerConfiguration::ProcessConfigurationLine(const char* line, Int_t
        // Read logical functions and descriptors
        if (ntokens < 2) {
 	 if ((((TObjString*)tokens->At(0))->String().CompareTo("EMPTY") == 0) ||
+	     (((TObjString*)tokens->At(0))->String().CompareTo("DTRUE") == 0) ||
 	     (((TObjString*)tokens->At(0))->String().CompareTo("DEMPTY") == 0)) {
 	   AddDescriptor(((TObjString*)tokens->At(0))->String(),
 			 strLine.ReplaceAll(((TObjString*)tokens->At(0))->String(),""));
@@ -612,6 +613,10 @@ Bool_t AliTriggerConfiguration::ProcessConfigurationLine(const char* line, Int_t
            AliError(Form("Invalid trigger cluster syntax (%s)!",strLine.Data()));
            return kFALSE;
          }
+	 if (((TObjString*)tokens->At(1))->String().Atoi() <= 0) {
+           AliError(Form("Invalid trigger cluster syntax (%s)!",strLine.Data()));
+           return kFALSE;
+         }
 	 TString strTemp;
 	 for(Int_t i = 2; i < ntokens; i++) {
 	   strTemp += ((TObjString*)tokens->At(i))->String();
@@ -654,7 +659,9 @@ Bool_t AliTriggerConfiguration::ProcessConfigurationLine(const char* line, Int_t
 	   return kFALSE;
          }
        if (((TObjString*)tokens->At(0))->String().CompareTo("NONE") == 0)
-	 AddMask(new AliTriggerBCMask(((TObjString*)tokens->At(0))->String()));
+       {	 
+         AddMask(new AliTriggerBCMask(((TObjString*)tokens->At(0))->String()));
+       }
        else {
 	 AddMask(((TObjString*)tokens->At(0))->String(),
 		      ((TObjString*)tokens->At(1))->String());
@@ -662,7 +669,7 @@ Bool_t AliTriggerConfiguration::ProcessConfigurationLine(const char* line, Int_t
        break;
      case 7:
        {
-         if (ntokens != 8) {
+         if ((ntokens < 8) || (ntokens >10)) {
   	   AliError(Form("Invalid trigger class syntax (%s)!",strLine.Data()));
 	   return kFALSE;
          }
@@ -909,7 +916,7 @@ Bool_t AliTriggerConfiguration::CheckConfiguration( TString& configfile )
       if( IsSelected( det->GetName(), detStr ) ) {
          AliInfo( Form( "Creating inputs for %s", det->GetName() ) );
          AliTriggerDetector* dtrg = det->CreateTriggerDetector();
-         dtrg->CreateInputs(GetInputs());
+         dtrg->AssignInputs(GetInputs());
          TObjArray* detInp = dtrg->GetInputs();
          for( Int_t i=0; i<detInp->GetEntriesFast(); i++ ) {
             AliInfo( Form( "Adding input %s", ((AliTriggerInput*)detInp->At(i))->GetName() ) );