diff --git a/Script/L1CFileNameParser.py b/Script/L1CFileNameParser.py index 6c364549ffa356c35a049f9dba447428583d069d..acbe1057fffe43dae053b5485dc02574dc3bc92f 100644 --- a/Script/L1CFileNameParser.py +++ b/Script/L1CFileNameParser.py @@ -4,6 +4,7 @@ __version__='$Revision$' #.data --> Standard file --> Projecttag #.tgz --> L1CaloRateArchive_yyyymmdd.tgz --> projecttag = l1calo_ratearchive +# --> Userdef1 = yyyy from BaseFileNameParser import BaseFileNameParser @@ -23,18 +24,23 @@ class L1CFileNameParser(BaseFileNameParser): if ext == '.data': self.parser = SFOFileNameParser(filename) self.project = self.parser.ProjectTag() + self.year = '' elif ext == '.tgz': self.parser = BaseFileNameParser(filename) self.project = 'l1calo_ratearchive' + self.year = filename.split('_')[1][:4] else: self.project = '' + self.year = '' for sym in needed_parser_symbols: - if not sym is 'ProjectTag': + if not sym in ['ProjectTag', 'UserDef1']: setattr(self, sym, getattr(self.parser, sym)) def ProjectTag(self): return self.project - + + def UserDef1(self): + return self.year