X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliTriggerConfiguration.cxx;h=2c3cbb2efe1d25dc60bac71bd076f14687e98e7c;hb=1c00c47a81904186229de6c308162cb8ece48543;hp=1a70041f946638662bfa41380b8f6ec16ccdbbbf;hpb=b98dcc47432910d2aa45f3c138a8f362d19a1ee6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliTriggerConfiguration.cxx b/STEER/AliTriggerConfiguration.cxx
index 1a70041f946..2c3cbb2efe1 100755
--- a/STEER/AliTriggerConfiguration.cxx
+++ b/STEER/AliTriggerConfiguration.cxx
@@ -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(),""));
@@ -658,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());