working up to AnalysisEtaP
changed 6Gamma Canvas structure