Psychometric g is just the general factor and psychometric s is just group factors, or sources of common variance modeled as factors, which are not g.

https://en.wikipedia.org/wiki/Two-factor_theory_of_intelligence#g_and_s