Index: trunk/MagicSoft/Mars/automatic-exclusions.rc
===================================================================
--- trunk/MagicSoft/Mars/automatic-exclusions.rc	(revision 9003)
+++ 	(revision )
@@ -1,101 +1,0 @@
-#SpecialRunCond means, that the exclusion has to be done up to that
-#run# but not after that run#
-
-#NumEventsSmaller10:
-key15.Column: fNumEvents
-#key15.Join1: 
-#key15.Join2: 
-key15.Cond: fNumEvents between 2 and 9 
-#key15.SpecialRunCond: 
-
-#NumEventsSmaller2:
-key18.Column: fNumEvents
-#key18.Join1: 
-#key18.Join2: 
-key18.Cond: fNumEvents < 2 
-#key18.SpecialRunCond: 
-
-#ProjectLikeTest:
-key17.Join1: Project
-#key17.Join2: 
-key17.Cond: fProjectName like '%test%'
-#key17.SpecialRunCond: 
-
-#FlagIsTest:
-key24.Join1: TestFlag
-#key24.Join2: 
-key24.Cond: fTestFlagName='Test'
-#key24.SpecialRunCond: 
-
-#ProjectLikeClose:
-key4.Join1: Project
-#key4.Join2: 
-key4.Cond: fProjectName like '%close%' 
-#key4.SpecialRunCond: 
-
-#SourceLikePark:
-key12.Join1: Source
-#key12.Join2: 
-key12.Cond: fSourceName like '%park%'
-#key12.SpecialRunCond: 
-
-#SourceLikeDummy:
-key14.Join1: Source
-#key14.Join2: 
-key14.Cond: fSourceName like '%dummy%'
-#key14.SpecialRunCond: 
-
-#ProjectLikeDummy:
-key16.Join1: Project
-#key16.Join2: 
-key16.Cond: fProjectName like '%dummy%'
-#key16.SpecialRunCond: 
-
-#ProjectLikeCL:
-key3.Join1: Project
-key3.Join2: CalibrationScript
-key3.Cond: fProjectName like binary '%CL%' or fCalibrationScriptName like '%ContinuosLight' 
-#key3.SpecialRunCond: 
-
-#ProjectLikeFFweak:
-key23.Join1: Project
-key23.Join2: CalibrationScript
-key23.Cond: fProjectName like binary '%FFweak%' or fCalibrationScriptName='Flatfielding_weak' 
-#key23.SpecialRunCond: 
-
-#ProjectLikeMovetel:
-key20.Join1: Project
-#key20.Join2: 
-key20.Cond: fProjectName like binary 'movetel%' 
-#key20.SpecialRunCond: 
-
-#ProjectLikeCurtain:
-key10.Join1: Project
-#key10.Join2: 
-key10.Cond: fProjectName like '%curtain%' 
-#key10.SpecialRunCond: 
-
-#PedRunWithNoPedTT:
-key11.Join1: RunType
-key11.Join2: L2TriggerTable
-key11.Cond: fRunTypeName='pedestal' and not (fL2TriggerTableName='PED') 
-key11.SpecialRunCond: 35659
-
-#TriggerTableNA:
-key6.Join1: L2TriggerTable
-key6.Join2: L1TriggerTable
-key6.Cond: fL2TriggerTableName='n/a' and fL1TriggerTableName='n/a'
-#key6.SpecialRunCond: 
-
-#DataRunWithTTPed:
-key2.Join1: RunType
-key2.Join2: L2TriggerTable
-key2.Cond: fRunType='data' and fL2TriggerTableName='PED' 
-#key2.SpecialRunCond: 
-
-#DTTableAsTriggerDelay:
-key21.Join1: TriggerDelayTable
-#key21.Join2: DiscriminatorThresholdTable
-key21.Cond: fTriggerDelayTableName like 'thresh%' 
-#key21.SpecialRunCond: 
-
Index: trunk/MagicSoft/Mars/resources/exclusions.rc
===================================================================
--- trunk/MagicSoft/Mars/resources/exclusions.rc	(revision 9004)
+++ trunk/MagicSoft/Mars/resources/exclusions.rc	(revision 9004)
@@ -0,0 +1,47 @@
+#DataRunWithTTPed:
+key2:    RunType.fRunType='data' AND L2TriggerTable.fL2TriggerTableName='PED' 
+
+#ProjectLikeCL:
+key3:    Project.fProjectName like binary '%CL%' or CalibrationScript.fCalibrationScriptName like '%ContinuosLight'
+
+#ProjectLikeClose:
+key4:    Project.fProjectName like '%close%' 
+
+#TriggerTableNA:
+key6:    L2TriggerTable.fL2TriggerTableName='n/a' AND L1TriggerTable.fL1TriggerTableName='n/a'
+
+#ProjectLikeCurtain:
+key10:   Project.fProjectName like '%curtain%' 
+
+#PedRunWithNoPedTT:
+key11:   RunType.fRunTypeName='pedestal' AND NOT (L2TriggerTable.fL2TriggerTableName='PED') AND fRunNumber<35659
+
+#SourceLikePark:
+key12:   Source.fSourceName like '%park%'
+
+#SourceLikeDummy:
+key14:   Source.fSourceName like '%dummy%'
+
+#NumEventsSmaller10:
+key15:   fNumEvents between 2 and 9 
+
+#ProjectLikeDummy:
+key16:   Project.fProjectName like '%dummy%'
+
+#ProjectLikeTest:
+key17:   Project.fProjectName like '%test%'
+
+#NumEventsSmaller2:
+key18:   fNumEvents < 2 
+
+#ProjectLikeMovetel:
+key20:   Project.fProjectName like binary 'movetel%' 
+
+#DTTableAsTriggerDelay:
+key21:   TriggerDelayTable.fTriggerDelayTableName like 'thresh%' 
+
+#ProjectLikeFFweak:
+key23:   Project.fProjectName like binary '%FFweak%' or CalibrationScript.fCalibrationScriptName='Flatfielding_weak'
+
+#FlagIsTest:
+key24:   TestFlag.fTestFlagName='Test'